X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-announce.ts;h=471dcfa77a10da326d4e37fdd6339025d31238b2;hb=9cfeb3cf989fffccdfe3e575903dc00baab255b2;hp=e685323e82affd031aec8d317f2860ed1b88faf0;hpb=3fd3ab2d34d512b160a5e6084d7609be7b4f4452;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/send/send-announce.ts b/server/lib/activitypub/send/send-announce.ts
index e685323e8..471dcfa77 100644
--- a/server/lib/activitypub/send/send-announce.ts
+++ b/server/lib/activitypub/send/send-announce.ts
@@ -1,108 +1,51 @@
 import { Transaction } from 'sequelize'
-import { ActivityAdd } from '../../../../shared/index'
-import { ActivityAnnounce, ActivityAudience, ActivityCreate } from '../../../../shared/models/activitypub'
-import { AccountModel } from '../../../models/account/account'
-import { VideoModel } from '../../../models/video/video'
-import { VideoChannelModel } from '../../../models/video/video-channel'
-import { getAnnounceActivityPubUrl } from '../url'
-import {
-  broadcastToFollowers,
-  getAccountsInvolvedInVideo,
-  getAccountsInvolvedInVideoChannel,
-  getAudience,
-  getObjectFollowersAudience,
-  getOriginVideoAudience,
-  getOriginVideoChannelAudience,
-  unicastTo
-} from './misc'
-import { addActivityData } from './send-add'
-import { createActivityData } from './send-create'
+import { ActivityAnnounce, ActivityAudience } from '../../../../shared/models/activitypub'
+import { broadcastToFollowers } from './utils'
+import { audiencify, getActorsInvolvedInVideo, getAudience, getAudienceFromFollowersOf } from '../audience'
+import { logger } from '../../../helpers/logger'
+import { MActorLight, MVideo } from '../../../types/models'
+import { MVideoShare } from '../../../types/models/video'
 
-async function buildVideoAnnounceToFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(video.url, byAccount)
+async function buildAnnounceWithVideoAudience (
+  byActor: MActorLight,
+  videoShare: MVideoShare,
+  video: MVideo,
+  t: Transaction
+) {
+  const announcedObject = video.url
 
-  const videoChannel = video.VideoChannel
-  const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject(), t)
+  const actorsInvolvedInVideo = await getActorsInvolvedInVideo(video, t)
+  const audience = getAudienceFromFollowersOf(actorsInvolvedInVideo)
 
-  const accountsToForwardView = await getAccountsInvolvedInVideo(video, t)
-  const audience = getObjectFollowersAudience(accountsToForwardView)
-  return announceActivityData(url, byAccount, announcedActivity, t, audience)
-}
-
-async function sendVideoAnnounceToFollowers (byAccount: AccountModel, video: VideoModel, t: Transaction) {
-  const data = await buildVideoAnnounceToFollowers(byAccount, video, t)
-
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
-}
-
-async function sendVideoAnnounceToOrigin (byAccount: AccountModel, video: VideoModel, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(video.url, byAccount)
-
-  const videoChannel = video.VideoChannel
-  const announcedActivity = await addActivityData(url, videoChannel.Account, video, videoChannel.url, video.toActivityPubObject(), t)
-
-  const accountsInvolvedInVideo = await getAccountsInvolvedInVideo(video, t)
-  const audience = getOriginVideoAudience(video, accountsInvolvedInVideo)
-  const data = await createActivityData(url, byAccount, announcedActivity, t, audience)
-
-  return unicastTo(data, byAccount, videoChannel.Account.sharedInboxUrl, t)
-}
-
-async function buildVideoChannelAnnounceToFollowers (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
-  const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
-
-  const accountsToForwardView = await getAccountsInvolvedInVideoChannel(videoChannel, t)
-  const audience = getObjectFollowersAudience(accountsToForwardView)
-  return announceActivityData(url, byAccount, announcedActivity, t, audience)
-}
-
-async function sendVideoChannelAnnounceToFollowers (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
-  const data = await buildVideoChannelAnnounceToFollowers(byAccount, videoChannel, t)
+  const activity = buildAnnounceActivity(videoShare.url, byActor, announcedObject, audience)
 
-  return broadcastToFollowers(data, byAccount, [ byAccount ], t)
+  return { activity, actorsInvolvedInVideo }
 }
 
-async function sendVideoChannelAnnounceToOrigin (byAccount: AccountModel, videoChannel: VideoChannelModel, t: Transaction) {
-  const url = getAnnounceActivityPubUrl(videoChannel.url, byAccount)
-  const announcedActivity = await createActivityData(url, videoChannel.Account, videoChannel.toActivityPubObject(), t)
+async function sendVideoAnnounce (byActor: MActorLight, videoShare: MVideoShare, video: MVideo, t: Transaction) {
+  const { activity, actorsInvolvedInVideo } = await buildAnnounceWithVideoAudience(byActor, videoShare, video, t)
 
-  const accountsInvolvedInVideo = await getAccountsInvolvedInVideoChannel(videoChannel, t)
-  const audience = getOriginVideoChannelAudience(videoChannel, accountsInvolvedInVideo)
-  const data = await createActivityData(url, byAccount, announcedActivity, t, audience)
+  logger.info('Creating job to send announce %s.', videoShare.url)
 
-  return unicastTo(data, byAccount, videoChannel.Account.sharedInboxUrl, t)
+  const followersException = [ byActor ]
+  return broadcastToFollowers(activity, byActor, actorsInvolvedInVideo, t, followersException, 'Announce')
 }
 
-async function announceActivityData (
-  url: string,
-  byAccount: AccountModel,
-  object: ActivityCreate | ActivityAdd,
-  t: Transaction,
-  audience?: ActivityAudience
-): Promise<ActivityAnnounce> {
-  if (!audience) {
-    audience = await getAudience(byAccount, t)
-  }
+function buildAnnounceActivity (url: string, byActor: MActorLight, object: string, audience?: ActivityAudience): ActivityAnnounce {
+  if (!audience) audience = getAudience(byActor)
 
-  return {
-    type: 'Announce',
-    to: audience.to,
-    cc: audience.cc,
+  return audiencify({
+    type: 'Announce' as 'Announce',
     id: url,
-    actor: byAccount.url,
+    actor: byActor.url,
     object
-  }
+  }, audience)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  sendVideoAnnounceToFollowers,
-  sendVideoChannelAnnounceToFollowers,
-  sendVideoAnnounceToOrigin,
-  sendVideoChannelAnnounceToOrigin,
-  announceActivityData,
-  buildVideoAnnounceToFollowers,
-  buildVideoChannelAnnounceToFollowers
+  sendVideoAnnounce,
+  buildAnnounceActivity,
+  buildAnnounceWithVideoAudience
 }