diff options
author | Chocobozzz <me@florianbigard.com> | 2018-01-26 15:49:57 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-01-26 15:49:57 +0100 |
commit | 4ba3b8ea1be85d95a508ac479f26b96ceea15971 (patch) | |
tree | f76de3c6ec591cf885e5000f0e369aab883f3d95 /server/controllers/activitypub/outbox.ts | |
parent | 7859b5800c08c15f3380fb3a7e267ce1b3f2df9f (diff) | |
download | PeerTube-4ba3b8ea1be85d95a508ac479f26b96ceea15971.tar.gz PeerTube-4ba3b8ea1be85d95a508ac479f26b96ceea15971.tar.zst PeerTube-4ba3b8ea1be85d95a508ac479f26b96ceea15971.zip |
Don't rehost announced video activities
Diffstat (limited to 'server/controllers/activitypub/outbox.ts')
-rw-r--r-- | server/controllers/activitypub/outbox.ts | 5 |
1 files changed, 2 insertions, 3 deletions
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' | |||
5 | import { ACTIVITY_PUB } from '../../initializers/constants' | 5 | import { ACTIVITY_PUB } from '../../initializers/constants' |
6 | import { announceActivityData, createActivityData } from '../../lib/activitypub/send' | 6 | import { announceActivityData, createActivityData } from '../../lib/activitypub/send' |
7 | import { buildAudience } from '../../lib/activitypub/send/misc' | 7 | import { buildAudience } from '../../lib/activitypub/send/misc' |
8 | import { getAnnounceActivityPubUrl } from '../../lib/activitypub/url' | ||
9 | import { asyncMiddleware, localAccountValidator } from '../../middlewares' | 8 | import { asyncMiddleware, localAccountValidator } from '../../middlewares' |
10 | import { AccountModel } from '../../models/account/account' | 9 | import { AccountModel } from '../../models/account/account' |
11 | import { ActorModel } from '../../models/activitypub/actor' | 10 | import { ActorModel } from '../../models/activitypub/actor' |
@@ -48,9 +47,9 @@ async function outboxController (req: express.Request, res: express.Response, ne | |||
48 | 47 | ||
49 | // This is a shared video | 48 | // This is a shared video |
50 | if (video.VideoShares !== undefined && video.VideoShares.length !== 0) { | 49 | if (video.VideoShares !== undefined && video.VideoShares.length !== 0) { |
50 | const videoShare = video.VideoShares[0] | ||
51 | const announceAudience = buildAudience(followersMatrix[actor.id]) | 51 | const announceAudience = buildAudience(followersMatrix[actor.id]) |
52 | const url = getAnnounceActivityPubUrl(video.url, actor) | 52 | const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience) |
53 | const announceActivity = await announceActivityData(url, actor, video.url, undefined, announceAudience) | ||
54 | 53 | ||
55 | activities.push(announceActivity) | 54 | activities.push(announceActivity) |
56 | } else { | 55 | } else { |