From 4ba3b8ea1be85d95a508ac479f26b96ceea15971 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 26 Jan 2018 15:49:57 +0100 Subject: Don't rehost announced video activities --- server/controllers/activitypub/client.ts | 2 +- server/controllers/activitypub/outbox.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'server/controllers') diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 2587ee212..7b60cc311 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -100,7 +100,7 @@ async function videoController (req: express.Request, res: express.Response, nex async function videoAnnounceController (req: express.Request, res: express.Response, next: express.NextFunction) { const share = res.locals.videoShare as VideoShareModel - const object = await buildVideoAnnounceToFollowers(share.Actor, res.locals.video, undefined) + const object = await buildVideoAnnounceToFollowers(share.Actor, share, res.locals.video, undefined) return res.json(activityPubContextify(object)) } diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts index 41c6ffaeb..86cdcf4cd 100644 --- a/server/controllers/activitypub/outbox.ts +++ b/server/controllers/activitypub/outbox.ts @@ -5,7 +5,6 @@ import { pageToStartAndCount } from '../../helpers/core-utils' import { ACTIVITY_PUB } from '../../initializers/constants' import { announceActivityData, createActivityData } from '../../lib/activitypub/send' import { buildAudience } from '../../lib/activitypub/send/misc' -import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url' import { asyncMiddleware, localAccountValidator } from '../../middlewares' import { AccountModel } from '../../models/account/account' import { ActorModel } from '../../models/activitypub/actor' @@ -48,9 +47,9 @@ async function outboxController (req: express.Request, res: express.Response, ne // This is a shared video if (video.VideoShares !== undefined && video.VideoShares.length !== 0) { + const videoShare = video.VideoShares[0] const announceAudience = buildAudience(followersMatrix[actor.id]) - const url = getAnnounceActivityPubUrl(video.url, actor) - const announceActivity = await announceActivityData(url, actor, video.url, undefined, announceAudience) + const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience) activities.push(announceActivity) } else { -- cgit v1.2.3