X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-announce.ts;h=fa1d47259a958af993b3bdae32eb3e0228e42cc8;hb=e251f170b00b2014ac4e823113c6ff40e3fb1471;hp=b8ea51bc08c81189946698eb88148e171d74b948;hpb=e71bcc0f4b31ecfd84a786411febfc6d18a85258;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/send/send-announce.ts b/server/lib/activitypub/send/send-announce.ts
index b8ea51bc0..fa1d47259 100644
--- a/server/lib/activitypub/send/send-announce.ts
+++ b/server/lib/activitypub/send/send-announce.ts
@@ -1,46 +1,50 @@
 import { Transaction } from 'sequelize'
-import { ActivityAdd } from '../../../../shared/index'
-import { ActivityAnnounce, ActivityCreate } from '../../../../shared/models/activitypub/activity'
-import { AccountInstance, VideoInstance } from '../../../models'
-import { VideoChannelInstance } from '../../../models/video/video-channel-interface'
-import { getAnnounceActivityPubUrl } from '../url'
-import { broadcastToFollowers } from './misc'
-import { addActivityData } from './send-add'
-import { createActivityData } from './send-create'
-
-async function sendVideoAnnounce (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(video.url, byAccount)
-
-  const videoChannel = video.VideoChannel
-  const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject())
-
-  const data = await announceActivityData(url, byAccount, announcedActivity)
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
+import { ActivityAnnounce, ActivityAudience } from '../../../../shared/models/activitypub'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { VideoModel } from '../../../models/video/video'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { broadcastToFollowers } from './utils'
+import { getActorsInvolvedInVideo, getAudience, getObjectFollowersAudience } from '../audience'
+
+async function buildVideoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
+  const announcedObject = video.url
+
+  const accountsToForwardView = await getActorsInvolvedInVideo(video, t)
+  const audience = getObjectFollowersAudience(accountsToForwardView)
+  return announceActivityData(videoShare.url, byActor, announcedObject, 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 sendVideoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
+  const data = await buildVideoAnnounce(byActor, videoShare, video, t)
 
-  const data = await announceActivityData(url, byAccount, announcedActivity)
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
+  return broadcastToFollowers(data, byActor, [ byActor ], t)
 }
 
-async function announceActivityData (url: string, byAccount: AccountInstance, object: ActivityCreate | ActivityAdd) {
-  const activity: ActivityAnnounce = {
+async function announceActivityData (
+  url: string,
+  byActor: ActorModel,
+  object: string,
+  t: Transaction,
+  audience?: ActivityAudience
+): Promise<ActivityAnnounce> {
+  if (!audience) {
+    audience = await getAudience(byActor, t)
+  }
+
+  return {
     type: 'Announce',
+    to: audience.to,
+    cc: audience.cc,
     id: url,
-    actor: byAccount.url,
+    actor: byActor.url,
     object
   }
-
-  return activity
 }
 
 // ---------------------------------------------------------------------------
 
 export {
   sendVideoAnnounce,
-  sendVideoChannelAnnounce,
-  announceActivityData
+  announceActivityData,
+  buildVideoAnnounce
 }