X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-announce.ts;h=578fbc630a032c471465e0dd6579ffe66273e1a5;hb=f40bbe3146553ef45515ee6b6d93ce6028f045ca;hp=4b3a4ef758ea5438cab86bcbb698c616fb81b1ac;hpb=892211e8493b1f992fce7616cb1e48b7ff87a1dc;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/activitypub/send/send-announce.ts b/server/lib/activitypub/send/send-announce.ts index 4b3a4ef75..578fbc630 100644 --- a/server/lib/activitypub/send/send-announce.ts +++ b/server/lib/activitypub/send/send-announce.ts @@ -1,45 +1,76 @@ import { Transaction } from 'sequelize' -import { AccountInstance, VideoInstance } from '../../../models' -import { VideoChannelInstance } from '../../../models/video/video-channel-interface' -import { broadcastToFollowers } from './misc' -import { addActivityData } from './send-add' -import { createActivityData } from './send-create' +import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub' +import { VideoPrivacy } from '../../../../shared/models/videos' +import { ActorModel } from '../../../models/activitypub/actor' +import { VideoModel } from '../../../models/video/video' import { getAnnounceActivityPubUrl } from '../url' +import { + broadcastToFollowers, + getActorsInvolvedInVideo, + getAudience, + getObjectFollowersAudience, + getOriginVideoAudience, + unicastTo +} from './misc' +import { createActivityData } from './send-create' -async function sendVideoAnnounce (byAccount: AccountInstance, video: VideoInstance, t: Transaction) { - const url = getAnnounceActivityPubUrl(video.url, byAccount) +async function buildVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) { + const url = getAnnounceActivityPubUrl(video.url, byActor) + const videoObject = video.toActivityPubObject() - const videoChannel = video.VideoChannel - const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject()) + const announcedAudience = await getAudience(byActor, t, video.privacy === VideoPrivacy.PUBLIC) + const announcedActivity = await createActivityData(url, video.VideoChannel.Account.Actor, videoObject, t, announcedAudience) - const data = await announceActivityData(url, byAccount, announcedActivity) - return broadcastToFollowers(data, byAccount, [ byAccount ], t) + const accountsToForwardView = await getActorsInvolvedInVideo(video, t) + const audience = getObjectFollowersAudience(accountsToForwardView) + return announceActivityData(url, byActor, announcedActivity, t, audience) } -async function sendVideoChannelAnnounce (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) { - const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount) - const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject()) +async function sendVideoAnnounceToFollowers (byActor: ActorModel, video: VideoModel, t: Transaction) { + const data = await buildVideoAnnounceToFollowers(byActor, video, t) - const data = await announceActivityData(url, byAccount, announcedActivity) - return broadcastToFollowers(data, byAccount, [ byAccount ], t) + return broadcastToFollowers(data, byActor, [ byActor ], t) } -// --------------------------------------------------------------------------- +async function sendVideoAnnounceToOrigin (byActor: ActorModel, video: VideoModel, t: Transaction) { + const url = getAnnounceActivityPubUrl(video.url, byActor) -export { - sendVideoAnnounce, - sendVideoChannelAnnounce + const videoObject = video.toActivityPubObject() + const announcedActivity = await createActivityData(url, video.VideoChannel.Account.Actor, videoObject, t) + + const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t) + const audience = getOriginVideoAudience(video, actorsInvolvedInVideo) + const data = await createActivityData(url, byActor, announcedActivity, t, audience) + + return unicastTo(data, byActor, video.VideoChannel.Account.Actor.sharedInboxUrl, t) } -// --------------------------------------------------------------------------- +async function announceActivityData ( + url: string, + byActor: ActorModel, + object: ActivityCreate, + t: Transaction, + audience?: ActivityAudience +): Promise { + if (!audience) { + audience = await getAudience(byActor, t) + } -async function announceActivityData (url: string, byAccount: AccountInstance, object: any) { - const activity = { + return { type: 'Announce', + to: audience.to, + cc: audience.cc, id: url, - actor: byAccount.url, + actor: byActor.url, object } +} - return activity +// --------------------------------------------------------------------------- + +export { + sendVideoAnnounceToFollowers, + sendVideoAnnounceToOrigin, + announceActivityData, + buildVideoAnnounceToFollowers }