forks/peertube
1
0
Fork 0
Code Releases Activity

Correctly set the activity audience in outbox

Browse source
This commit is contained in:
Chocobozzz 2018-02-04 23:17:01 +01:00
parent 6500a90cfe
commit 0bc22f8d7e
No known key found for this signature in database
GPG key ID: 583A612D890159BE
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/controllers/activitypub/outbox.ts
View file

@ -1,5 +1,6 @@
import * as express from 'express' import * as express from 'express'
import { Activity } from '../../../shared/models/activitypub/activity' import { Activity } from '../../../shared/models/activitypub/activity'
import { VideoPrivacy } from '../../../shared/models/videos'
import { activityPubCollectionPagination } from '../../helpers/activitypub' import { activityPubCollectionPagination } from '../../helpers/activitypub'
import { pageToStartAndCount } from '../../helpers/core-utils' import { pageToStartAndCount } from '../../helpers/core-utils'
import { ACTIVITY_PUB } from '../../initializers/constants' import { ACTIVITY_PUB } from '../../initializers/constants'
@ -43,12 +44,12 @@ async function outboxController (req: express.Request, res: express.Response, ne
for (const video of data.data) { for (const video of data.data) {
const byActor = video.VideoChannel.Account.Actor const byActor = video.VideoChannel.Account.Actor
const createActivityAudience = buildAudience(followersMatrix[byActor.id]) const createActivityAudience = buildAudience(followersMatrix[byActor.id], video.privacy === VideoPrivacy.PUBLIC)
// This is a shared video // This is a shared video
if (video.VideoShares !== undefined && video.VideoShares.length !== 0) { if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
const videoShare = video.VideoShares[0] const videoShare = video.VideoShares[0]
const announceAudience = buildAudience(followersMatrix[actor.id]) const announceAudience = buildAudience(followersMatrix[actor.id], video.privacy === VideoPrivacy.PUBLIC)
const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience) const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience)
activities.push(announceActivity) activities.push(announceActivity)