-import { ActivityFollow } from '../../../../shared/models/activitypub'
-import { ActorModel } from '../../../models/activitypub/actor'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { getActorFollowActivityPubUrl } from '../url'
-import { unicastTo } from './utils'
-import { logger } from '../../../helpers/logger'
import { Transaction } from 'sequelize'
+import { ActivityFollow } from '@shared/models'
+import { logger } from '../../../helpers/logger'
+import { MActor, MActorFollowActors } from '../../../types/models'
+import { unicastTo } from './shared/send-utils'
-function sendFollow (actorFollow: ActorFollowModel, t: Transaction) {
+function sendFollow (actorFollow: MActorFollowActors, t: Transaction) {
const me = actorFollow.ActorFollower
const following = actorFollow.ActorFollowing
logger.info('Creating job to send follow request to %s.', following.url)
- const url = getActorFollowActivityPubUrl(me, following)
- const data = buildFollowActivity(url, me, following)
+ const data = buildFollowActivity(actorFollow.url, me, following)
- t.afterCommit(() => unicastTo(data, me, following.inboxUrl))
+ return t.afterCommit(() => {
+ return unicastTo({ data, byActor: me, toActorUrl: following.inboxUrl, contextType: 'Follow' })
+ })
}
-function buildFollowActivity (url: string, byActor: ActorModel, targetActor: ActorModel): ActivityFollow {
+function buildFollowActivity (url: string, byActor: MActor, targetActor: MActor): ActivityFollow {
return {
type: 'Follow',
id: url,