-import { ActivityAccept, ActivityFollow } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
-import { unicastTo } from './utils'
-import { followActivityData } from './send-follow'
+import { ActivityAccept, ActivityFollow } from '@shared/models'
import { logger } from '../../../helpers/logger'
+import { MActor, MActorFollowActors } from '../../../types/models'
+import { getLocalActorFollowAcceptActivityPubUrl } from '../url'
+import { buildFollowActivity } from './send-follow'
+import { unicastTo } from './shared/send-utils'
-async function sendAccept (actorFollow: ActorFollowModel) {
+function sendAccept (actorFollow: MActorFollowActors) {
const follower = actorFollow.ActorFollower
const me = actorFollow.ActorFollowing
logger.info('Creating job to accept follower %s.', follower.url)
- const followUrl = getActorFollowActivityPubUrl(actorFollow)
- const followData = followActivityData(followUrl, follower, me)
+ const followData = buildFollowActivity(actorFollow.url, follower, me)
- const url = getActorFollowAcceptActivityPubUrl(actorFollow)
- const data = acceptActivityData(url, me, followData)
+ const url = getLocalActorFollowAcceptActivityPubUrl(actorFollow)
+ const data = buildAcceptActivity(url, me, followData)
- return unicastTo(data, me, follower.inboxUrl)
+ return unicastTo({
+ data,
+ byActor: me,
+ toActorUrl: follower.inboxUrl,
+ contextType: 'Accept'
+ })
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function acceptActivityData (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityAccept {
+function buildAcceptActivity (url: string, byActor: MActor, followActivityData: ActivityFollow): ActivityAccept {
return {
type: 'Accept',
id: url,