import { ActivityFollow, ActivityReject } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
+import { getActorFollowActivityPubUrl, getActorFollowRejectActivityPubUrl } from '../url'
import { unicastTo } from './utils'
import { buildFollowActivity } from './send-follow'
import { logger } from '../../../helpers/logger'
+import { MActor } from '../../../typings/models'
-async function sendReject (actorFollow: ActorFollowModel) {
- const follower = actorFollow.ActorFollower
- const me = actorFollow.ActorFollowing
-
+async function sendReject (follower: MActor, following: MActor) {
if (!follower.serverId) { // This should never happen
logger.warn('Do not sending reject to local follower.')
return
logger.info('Creating job to reject follower %s.', follower.url)
- const followUrl = getActorFollowActivityPubUrl(actorFollow)
- const followData = buildFollowActivity(followUrl, follower, me)
+ const followUrl = getActorFollowActivityPubUrl(follower, following)
+ const followData = buildFollowActivity(followUrl, follower, following)
- const url = getActorFollowAcceptActivityPubUrl(actorFollow)
- const data = buildRejectActivity(url, me, followData)
+ const url = getActorFollowRejectActivityPubUrl(follower, following)
+ const data = buildRejectActivity(url, following, followData)
- return unicastTo(data, me, follower.inboxUrl)
+ return unicastTo(data, following, follower.inboxUrl)
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function buildRejectActivity (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityReject {
+function buildRejectActivity (url: string, byActor: MActor, followActivityData: ActivityFollow): ActivityReject {
return {
type: 'Reject',
id: url,