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 { MActor, MActorFollowActors } from '../../../typings/models'
-function sendFollow (actorFollow: ActorFollowModel) {
+function sendFollow (actorFollow: MActorFollowActors, t: Transaction) {
const me = actorFollow.ActorFollower
const following = actorFollow.ActorFollowing
- const url = getActorFollowActivityPubUrl(actorFollow)
- const data = followActivityData(url, me, following)
+ // Same server as ours
+ if (!following.serverId) return
- return unicastTo(data, me, following.inboxUrl)
+ logger.info('Creating job to send follow request to %s.', following.url)
+
+ const url = getActorFollowActivityPubUrl(me, following)
+ const data = buildFollowActivity(url, me, following)
+
+ t.afterCommit(() => unicastTo(data, me, following.inboxUrl))
}
-function followActivityData (url: string, byActor: ActorModel, targetActor: ActorModel): ActivityFollow {
+function buildFollowActivity (url: string, byActor: MActor, targetActor: MActor): ActivityFollow {
return {
type: 'Follow',
id: url,
export {
sendFollow,
- followActivityData
+ buildFollowActivity
}