-import { Transaction } from 'sequelize'
-import { ActivityAccept } from '../../../../shared/models/activitypub'
+import { ActivityAccept, ActivityFollow } from '../../../../shared/models/activitypub'
import { ActorModel } from '../../../models/activitypub/actor'
import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { getActorFollowAcceptActivityPubUrl } from '../url'
+import { getActorFollowAcceptActivityPubUrl, getActorFollowActivityPubUrl } from '../url'
import { unicastTo } from './misc'
+import { followActivityData } from './send-follow'
-async function sendAccept (actorFollow: ActorFollowModel, t: Transaction) {
+async function sendAccept (actorFollow: ActorFollowModel) {
const follower = actorFollow.ActorFollower
const me = actorFollow.ActorFollowing
+ const followUrl = getActorFollowActivityPubUrl(actorFollow)
+ const followData = followActivityData(followUrl, follower, me)
+
const url = getActorFollowAcceptActivityPubUrl(actorFollow)
- const data = acceptActivityData(url, me)
+ const data = acceptActivityData(url, me, followData)
- return unicastTo(data, me, follower.inboxUrl, t)
+ return unicastTo(data, me, follower.inboxUrl)
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
-function acceptActivityData (url: string, byActor: ActorModel): ActivityAccept {
+function acceptActivityData (url: string, byActor: ActorModel, followActivityData: ActivityFollow): ActivityAccept {
return {
type: 'Accept',
id: url,
- actor: byActor.url
+ actor: byActor.url,
+ object: followActivityData
}
}