Improve AP validation for Notes

[github/Chocobozzz/PeerTube.git] / server / lib / activitypub / send / send-update.ts

diff --git a/server/lib/activitypub/send/send-update.ts b/server/lib/activitypub/send/send-update.ts
index 48bbbcac18b0fa51baec7a3799465081046b252a..e15fecff656cde6d137dee1c12a36a8af4a52cc5 100644 (file)
--- a/server/lib/activitypub/send/send-update.ts
+++ b/server/lib/activitypub/send/send-update.ts
@@ -1,11 +1,13 @@
 import { Transaction } from 'sequelize'
 import { ActivityAudience, ActivityUpdate } from '../../../../shared/models/activitypub'
 import { VideoPrivacy } from '../../../../shared/models/videos'
+import { AccountModel } from '../../../models/account/account'
 import { ActorModel } from '../../../models/activitypub/actor'
 import { VideoModel } from '../../../models/video/video'
+import { VideoChannelModel } from '../../../models/video/video-channel'
 import { VideoShareModel } from '../../../models/video/video-share'
 import { getUpdateActivityPubUrl } from '../url'
-import { broadcastToFollowers, getAudience } from './misc'
+import { audiencify, broadcastToFollowers, getAudience } from './misc'
 
 async function sendUpdateVideo (video: VideoModel, t: Transaction) {
   const byActor = video.VideoChannel.Account.Actor
@@ -22,9 +24,32 @@ async function sendUpdateVideo (video: VideoModel, t: Transaction) {
   return broadcastToFollowers(data, byActor, actorsInvolved, t)
 }
 
+async function sendUpdateActor (accountOrChannel: AccountModel | VideoChannelModel, t: Transaction) {
+  const byActor = accountOrChannel.Actor
+
+  const url = getUpdateActivityPubUrl(byActor.url, byActor.updatedAt.toISOString())
+  const accountOrChannelObject = accountOrChannel.toActivityPubObject()
+  const audience = await getAudience(byActor, t)
+  const data = await updateActivityData(url, byActor, accountOrChannelObject, t, audience)
+
+  let actorsInvolved: ActorModel[]
+  if (accountOrChannel instanceof AccountModel) {
+    // Actors that shared my videos are involved too
+    actorsInvolved = await VideoShareModel.loadActorsByVideoOwner(byActor.id, t)
+  } else {
+    // Actors that shared videos of my channel are involved too
+    actorsInvolved = await VideoShareModel.loadActorsByVideoChannel(accountOrChannel.id, t)
+  }
+
+  actorsInvolved.push(byActor)
+
+  return broadcastToFollowers(data, byActor, actorsInvolved, t)
+}
+
 // ---------------------------------------------------------------------------
 
 export {
+  sendUpdateActor,
   sendUpdateVideo
 }
 
@@ -41,12 +66,10 @@ async function updateActivityData (
     audience = await getAudience(byActor, t)
   }
 
-  return {
-    type: 'Update',
+  return audiencify({
+    type: 'Update' as 'Update',
     id: url,
     actor: byActor.url,
-    to: audience.to,
-    cc: audience.cc,
-    object
-  }
+    object: audiencify(object, audience)
+  }, audience)
 }