X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fprocess%2Fprocess-accept.ts;h=046370b79dc0124366276903110d43c7657ff995;hb=f37dc0dd14d9ce0b59c454c2c1b935fcbe9727e9;hp=7db2f8ff03c33a32468852d8d3e731497725fb28;hpb=94a5ff8a4a75d75bb9df542a39ce8769e7a7e6a4;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/process/process-accept.ts b/server/lib/activitypub/process/process-accept.ts index 7db2f8ff0..046370b79 100644 --- a/server/lib/activitypub/process/process-accept.ts +++ b/server/lib/activitypub/process/process-accept.ts @@ -1,12 +1,14 @@ 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) }