X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-announce.ts;h=cd0cab7ee5a034a62c7658c63ee566a47aeeb467;hb=b718fd22374d64534bcfe69932cf562894abed6a;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..cd0cab7ee 100644
--- a/server/lib/activitypub/send/send-announce.ts
+++ b/server/lib/activitypub/send/send-announce.ts
@@ -1,45 +1,47 @@
 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 { getAnnounceActivityPubUrl } from '../url'
+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 { audiencify, getActorsInvolvedInVideo, getAudience, getAudienceFromFollowersOf } from '../audience'
+import { logger } from '../../../helpers/logger'
 
-async function sendVideoAnnounce (byAccount: AccountInstance, video: VideoInstance, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(video.url, byAccount)
+async function buildAnnounceWithVideoAudience (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
+  const announcedObject = video.url
 
-  const videoChannel = video.VideoChannel
-  const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject())
+  const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
+  const audience = getAudienceFromFollowersOf(actorsInvolvedInVideo)
 
-  const data = await announceActivityData(url, byAccount, announcedActivity)
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
-}
-
-async function sendVideoChannelAnnounce (byAccount: AccountInstance, videoChannel: VideoChannelInstance, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
-  const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject())
+  const activity = buildAnnounceActivity(videoShare.url, byActor, announcedObject, audience)
 
-  const data = await announceActivityData(url, byAccount, announcedActivity)
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
+  return { activity, actorsInvolvedInVideo }
 }
 
-// ---------------------------------------------------------------------------
+async function sendVideoAnnounce (byActor: ActorModel, videoShare: VideoShareModel, video: VideoModel, t: Transaction) {
+  const { activity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, t)
 
-export {
-  sendVideoAnnounce,
-  sendVideoChannelAnnounce
+  logger.info('Creating job to send announce %s.', videoShare.url)
+
+  const followersException = [ byActor ]
+  return broadcastToFollowers(activity, byActor, actorsInvolvedInVideo, t, followersException)
 }
 
-// ---------------------------------------------------------------------------
+function buildAnnounceActivity (url: string, byActor: ActorModel, object: string, audience?: ActivityAudience): ActivityAnnounce {
+  if (!audience) audience = getAudience(byActor)
 
-async function announceActivityData (url: string, byAccount: AccountInstance, object: any) {
-  const activity = {
-    type: 'Announce',
+  return audiencify({
+    type: 'Announce' as 'Announce',
     id: url,
-    actor: byAccount.url,
+    actor: byActor.url,
     object
-  }
+  }, audience)
+}
+
+// ---------------------------------------------------------------------------
 
-  return activity
+export {
+  sendVideoAnnounce,
+  buildAnnounceActivity,
+  buildAnnounceWithVideoAudience
 }