X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Factivitypub%2Fsend%2Fsend-delete.ts;h=3d1dfb699e287965bbbf974741be4ef2a34f5a41;hb=a651038487faa838bda3ce04695b08bc65baff70;hp=8193790b3fc8210051cbe42e198f8000fa0b4555;hpb=98ec8b8e73a918d5680e6f13aaef56ca8756c2a8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/activitypub/send/send-delete.ts b/server/lib/activitypub/send/send-delete.ts
index 8193790b3..3d1dfb699 100644
--- a/server/lib/activitypub/send/send-delete.ts
+++ b/server/lib/activitypub/send/send-delete.ts
@@ -1,53 +1,88 @@
 import { Transaction } from 'sequelize'
-import { ActivityDelete } from '../../../../shared/models/activitypub/activity'
-import { database as db } from '../../../initializers'
-import { AccountInstance, VideoChannelInstance, VideoInstance } from '../../../models'
-import { broadcastToFollowers } from './misc'
+import { ActivityAudience, ActivityDelete } from '../../../../shared/models/activitypub'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { VideoModel } from '../../../models/video/video'
+import { VideoCommentModel } from '../../../models/video/video-comment'
+import { VideoShareModel } from '../../../models/video/video-share'
+import { getDeleteActivityPubUrl } from '../url'
+import { broadcastToActors, broadcastToFollowers, unicastTo } from './utils'
+import { audiencify, getActorsInvolvedInVideo, getVideoCommentAudience } from '../audience'
+import { logger } from '../../../helpers/logger'
 
-async function sendDeleteVideoChannel (videoChannel: VideoChannelInstance, t: Transaction) {
-  const byAccount = videoChannel.Account
+async function sendDeleteVideo (video: VideoModel, t: Transaction) {
+  logger.info('Creating job to broadcast delete of video %s.', video.url)
 
-  const data = deleteActivityData(videoChannel.url, byAccount)
+  const url = getDeleteActivityPubUrl(video.url)
+  const byActor = video.VideoChannel.Account.Actor
 
-  const accountsInvolved = await db.VideoChannelShare.loadAccountsByShare(videoChannel.id, t)
-  accountsInvolved.push(byAccount)
+  const data = deleteActivityData(url, video.url, byActor)
 
-  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
+  const actorsInvolved = await VideoShareModel.loadActorsByShare(video.id, t)
+  actorsInvolved.push(byActor)
+
+  return broadcastToFollowers(data, byActor, actorsInvolved, t)
 }
 
-async function sendDeleteVideo (video: VideoInstance, t: Transaction) {
-  const byAccount = video.VideoChannel.Account
+async function sendDeleteActor (byActor: ActorModel, t: Transaction) {
+  logger.info('Creating job to broadcast delete of actor %s.', byActor.url)
 
-  const data = deleteActivityData(video.url, byAccount)
+  const url = getDeleteActivityPubUrl(byActor.url)
+  const data = deleteActivityData(url, byActor.url, byActor)
 
-  const accountsInvolved = await db.VideoShare.loadAccountsByShare(video.id, t)
-  accountsInvolved.push(byAccount)
+  const actorsInvolved = await VideoShareModel.loadActorsByVideoOwner(byActor.id, t)
+  actorsInvolved.push(byActor)
 
-  return broadcastToFollowers(data, byAccount, accountsInvolved, t)
+  return broadcastToFollowers(data, byActor, actorsInvolved, t)
 }
 
-async function sendDeleteAccount (account: AccountInstance, t: Transaction) {
-  const data = deleteActivityData(account.url, account)
+async function sendDeleteVideoComment (videoComment: VideoCommentModel, t: Transaction) {
+  logger.info('Creating job to send delete of comment %s.', videoComment.url)
+
+  const isVideoOrigin = videoComment.Video.isOwned()
+
+  const url = getDeleteActivityPubUrl(videoComment.url)
+  const byActor = videoComment.Account.Actor
+  const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, t)
+
+  const actorsInvolvedInComment = await getActorsInvolvedInVideo(videoComment.Video, t)
+  actorsInvolvedInComment.push(byActor)
+
+  const audience = getVideoCommentAudience(videoComment, threadParentComments, actorsInvolvedInComment, isVideoOrigin)
+  const data = deleteActivityData(url, videoComment.url, byActor, audience)
 
-  return broadcastToFollowers(data, account, [ account ], t)
+  // This was a reply, send it to the parent actors
+  const actorsException = [ byActor ]
+  await broadcastToActors(data, byActor, threadParentComments.map(c => c.Account.Actor), actorsException)
+
+  // Broadcast to our followers
+  await broadcastToFollowers(data, byActor, [ byActor ], t)
+
+  // Send to actors involved in the comment
+  if (isVideoOrigin) return broadcastToFollowers(data, byActor, actorsInvolvedInComment, t, actorsException)
+
+  // Send to origin
+  return unicastTo(data, byActor, videoComment.Video.VideoChannel.Account.Actor.sharedInboxUrl)
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  sendDeleteVideoChannel,
   sendDeleteVideo,
-  sendDeleteAccount
+  sendDeleteActor,
+  sendDeleteVideoComment
 }
 
 // ---------------------------------------------------------------------------
 
-function deleteActivityData (url: string, byAccount: AccountInstance) {
-  const activity: ActivityDelete = {
-    type: 'Delete',
+function deleteActivityData (url: string, object: string, byActor: ActorModel, audience?: ActivityAudience): ActivityDelete {
+  const activity = {
+    type: 'Delete' as 'Delete',
     id: url,
-    actor: byAccount.url
+    actor: byActor.url,
+    object
   }
 
+  if (audience) return audiencify(activity, audience)
+
   return activity
 }