Fix actor outbox

3 files changed, 19 insertions, 10 deletions

diff --git a/server/controllers/activitypub/outbox.ts b/server/controllers/activitypub/outbox.ts
index 97bf9b052..2793ae267 100644
--- a/server/controllers/activitypub/outbox.ts
+++ b/server/controllers/activitypub/outbox.ts
@@ -47,17 +47,14 @@ async function buildActivities (actor: ActorModel, start: number, count: number)
   const actors = data.data.map(v => v.VideoChannel.Account.Actor)
   actors.push(actor)
 
-  const followersMatrix = await ActorModel.getActorsFollowerSharedInboxUrls(actors, undefined)
-
   for (const video of data.data) {
     const byActor = video.VideoChannel.Account.Actor
-    const createActivityAudience = buildAudience(followersMatrix[byActor.id], video.privacy === VideoPrivacy.PUBLIC)
+    const createActivityAudience = buildAudience([ byActor.followersUrl ], video.privacy === VideoPrivacy.PUBLIC)
 
     // This is a shared video
     if (video.VideoShares !== undefined && video.VideoShares.length !== 0) {
       const videoShare = video.VideoShares[0]
-      const announceAudience = buildAudience(followersMatrix[actor.id], video.privacy === VideoPrivacy.PUBLIC)
-      const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, announceAudience)
+      const announceActivity = await announceActivityData(videoShare.url, actor, video.url, undefined, createActivityAudience)
 
       activities.push(announceActivity)
     } else {
diff --git a/server/lib/activitypub/audience.ts b/server/lib/activitypub/audience.ts
index 916358fe2..c1265dbcd 100644
--- a/server/lib/activitypub/audience.ts
+++ b/server/lib/activitypub/audience.ts
@@ -59,14 +59,13 @@ async function getAudience (actorSender: ActorModel, t: Transaction, isPublic =
   return buildAudience([ actorSender.followersUrl ], isPublic)
 }
 
-function buildAudience (followerInboxUrls: string[], isPublic = true) {
-  // Thanks Mastodon: https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/tag_manager.rb#L47
+function buildAudience (followerUrls: string[], isPublic = true) {
   let to = []
   let cc = []
 
   if (isPublic) {
     to = [ ACTIVITY_PUB.PUBLIC ]
-    cc = followerInboxUrls
+    cc = followerUrls
   } else { // Unlisted
     to = [ ]
     cc = [ ]
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index f4689fe12..1640cd57f 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -602,6 +602,19 @@ export class VideoModel extends Model<VideoModel> {
           attributes: [ 'id', 'url' ],
           model: VideoShareModel.unscoped(),
           required: false,
+          // We only want videos shared by this actor
+          where: {
+            [Sequelize.Op.and]: [
+              {
+                id: {
+                  [Sequelize.Op.not]: null
+                }
+              },
+              {
+                actorId
+              }
+            ]
+          },
           include: [
             {
               attributes: [ 'id', 'url' ],
@@ -619,14 +632,14 @@ export class VideoModel extends Model<VideoModel> {
               required: true,
               include: [
                 {
-                  attributes: [ 'id', 'url' ],
+                  attributes: [ 'id', 'url', 'followersUrl' ],
                   model: ActorModel.unscoped(),
                   required: true
                 }
               ]
             },
             {
-              attributes: [ 'id', 'url' ],
+              attributes: [ 'id', 'url', 'followersUrl' ],
               model: ActorModel.unscoped(),
               required: true
             }