From 6be84cbcea99518e8eca58c76259effd0dd992fd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 22 Mar 2018 18:40:33 +0100 Subject: Improve activity pub actors implementation --- server/lib/activitypub/process/process-accept.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'server/lib/activitypub/process/process-accept.ts') diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts index 7db2f8ff0..c55b57820 100644 --- a/server/lib/activitypub/process/process-accept.ts +++ b/server/lib/activitypub/process/process-accept.ts @@ -1,4 +1,5 @@ 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' @@ -6,7 +7,8 @@ import { addFetchOutboxJob } from '../fetch' 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) } -- cgit v1.2.3