From 7acee6f18aac99e359360fc4f2362d5405135a79 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 26 Jan 2018 12:02:18 +0100 Subject: Fix announce activities --- server/controllers/activitypub/outbox.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'server/controllers/activitypub') diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts index ab12a7c4b..41c6ffaeb 100644 --- a/server/controllers/activitypub/outbox.ts +++ b/server/controllers/activitypub/outbox.ts @@ -43,21 +43,18 @@ async function outboxController (req: express.Request, res: express.Response, ne const followersMatrix = await ActorModel.getActorsFollowerSharedInboxUrls(actors, undefined) for (const video of data.data) { - const videoObject = video.toActivityPubObject() - const byActor = video.VideoChannel.Account.Actor const createActivityAudience = buildAudience(followersMatrix[byActor.id]) // This is a shared video if (video.VideoShares !== undefined && video.VideoShares.length !== 0) { - const createActivity = await createActivityData(video.url, byActor, videoObject, undefined, createActivityAudience) - const announceAudience = buildAudience(followersMatrix[actor.id]) const url = getAnnounceActivityPubUrl(video.url, actor) - const announceActivity = await announceActivityData(url, actor, createActivity, undefined, announceAudience) + const announceActivity = await announceActivityData(url, actor, video.url, undefined, announceAudience) activities.push(announceActivity) } else { + const videoObject = video.toActivityPubObject() const createActivity = await createActivityData(video.url, byActor, videoObject, undefined, createActivityAudience) activities.push(createActivity) -- cgit v1.2.3