import { ActivityAccept } from '../../../../shared/models/activitypub'
+import { getActorUrl } from '../../../helpers/activitypub'
import { ActorModel } from '../../../models/activitypub/actor'
import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
-import { addFetchOutboxJob } from '../fetch'
+import { addFetchOutboxJob } from '../actor'
async function processAcceptActivity (activity: ActivityAccept, inboxActor?: ActorModel) {
if (inboxActor === undefined) throw new Error('Need to accept on explicit inbox.')
- const targetActor = await ActorModel.loadByUrl(activity.actor)
+ const actorUrl = getActorUrl(activity.actor)
+ const targetActor = await ActorModel.loadByUrl(actorUrl)
return processAccept(inboxActor, targetActor)
}
const follow = await ActorFollowModel.loadByActorAndTarget(actor.id, targetActor.id)
if (!follow) throw new Error('Cannot find associated follow.')
- follow.set('state', 'accepted')
- await follow.save()
- await addFetchOutboxJob(targetActor, undefined)
+ if (follow.state !== 'accepted') {
+ follow.set('state', 'accepted')
+ await follow.save()
+ await addFetchOutboxJob(targetActor)
+ }
}