Reduce video comment sql query size

packages/tests/src/api/object-storage/video-static-file-privacy.ts

@@ -352,13 +352,18 @@ describe('Object storage for video static file privacy', function () {
 
         await makeRawRequest({ url, token: server.accessToken, expectedStatus: HttpStatusCode.OK_200 })
         await makeRawRequest({ url, query: { videoFileToken: fileToken }, expectedStatus: HttpStatusCode.OK_200 })
-        if (videoPassword) {
-          await makeRawRequest({ url, headers: { 'x-peertube-video-password': videoPassword }, expectedStatus: HttpStatusCode.OK_200 })
-        }
+
         await makeRawRequest({ url, token: userToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
         await makeRawRequest({ url, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
         await makeRawRequest({ url, query: { videoFileToken: unrelatedFileToken }, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
+
         if (videoPassword) {
+          await makeRawRequest({
+            url,
+            headers: { 'x-peertube-video-password': videoPassword },
+            expectedStatus: HttpStatusCode.OK_200
+          })
+
           await makeRawRequest({
             url,
             headers: { 'x-peertube-video-password': 'incorrectPassword' },

server/core/controllers/activitypub/inbox.ts

@@ -64,7 +64,7 @@ function inboxController (req: express.Request, res: express.Response) {
   }
 
   // Only keep activities we are able to process
-  logger.debug('Filtering %d activities...', activities.length)
+  logger.debug('Filtering %d activities...', activities.length, { activities })
   activities = activities.filter(a => isActivityValid(a))
   logger.debug('We keep %d activities.', activities.length, { activities })
 

server/core/lib/activitypub/send/send-create.ts

@@ -32,6 +32,7 @@ import {
   sendVideoRelatedActivity,
   unicastTo
 } from './shared/index.js'
+import { AccountModel } from '@server/models/account/account.js'
 
 const lTags = loggerTagsFactory('ap', 'create')
 
@@ -114,6 +115,8 @@ async function sendCreateVideoComment (comment: MCommentOwnerVideo, transaction:
   const isOrigin = comment.Video.isOwned()
 
   const byActor = comment.Account.Actor
+  const videoAccount = await AccountModel.load(comment.Video.VideoChannel.Account.id, transaction)
+
   const threadParentComments = await VideoCommentModel.listThreadParentComments(comment, transaction)
   const commentObject = comment.toActivityPubObject(threadParentComments) as VideoCommentObject
 
@@ -170,7 +173,7 @@ async function sendCreateVideoComment (comment: MCommentOwnerVideo, transaction:
     return unicastTo({
       data: createActivity,
       byActor,
-      toActorUrl: comment.Video.VideoChannel.Account.Actor.getSharedInbox(),
+      toActorUrl: videoAccount.Actor.getSharedInbox(),
       contextType: 'Comment'
     })
   })

server/core/lib/activitypub/send/send-delete.ts

@@ -11,6 +11,7 @@ import { audiencify } from '../audience.js'
 import { getDeleteActivityPubUrl } from '../url.js'
 import { getActorsInvolvedInVideo, getVideoCommentAudience } from './shared/index.js'
 import { broadcastToActors, broadcastToFollowers, sendVideoRelatedActivity, unicastTo } from './shared/send-utils.js'
+import { AccountModel } from '@server/models/account/account.js'
 
 async function sendDeleteVideo (video: MVideoAccountLight, transaction: Transaction) {
   logger.info('Creating job to broadcast delete of video %s.', video.url)
@@ -55,9 +56,12 @@ async function sendDeleteVideoComment (videoComment: MCommentOwnerVideo, transac
   const isVideoOrigin = videoComment.Video.isOwned()
 
   const url = getDeleteActivityPubUrl(videoComment.url)
+
+  const videoAccount = await AccountModel.load(videoComment.Video.VideoChannel.Account.id, transaction)
+
   const byActor = videoComment.isOwned()
     ? videoComment.Account.Actor
-    : videoComment.Video.VideoChannel.Account.Actor
+    : videoAccount.Actor
 
   const threadParentComments = await VideoCommentModel.listThreadParentComments(videoComment, transaction)
   const threadParentCommentsFiltered = threadParentComments.filter(c => !c.isDeleted())
@@ -105,7 +109,7 @@ async function sendDeleteVideoComment (videoComment: MCommentOwnerVideo, transac
     return unicastTo({
       data: activity,
       byActor,
-      toActorUrl: videoComment.Video.VideoChannel.Account.Actor.getSharedInbox(),
+      toActorUrl: videoAccount.Actor.getSharedInbox(),
       contextType: 'Delete'
     })
   })

server/core/lib/activitypub/send/shared/audience-utils.ts

@@ -53,10 +53,10 @@ function getAudienceFromFollowersOf (actorsInvolvedInObject: MActorFollowersUrl[
 async function getActorsInvolvedInVideo (video: MVideoId, t: Transaction) {
   const actors = await VideoShareModel.listActorIdsAndFollowerUrlsByShare(video.id, t)
 
-  const videoAll = video as VideoModel
+  const alreadyLoadedActor = (video as VideoModel).VideoChannel?.Account?.Actor
 
-  const videoActor = videoAll.VideoChannel?.Account
-    ? videoAll.VideoChannel.Account.Actor
+  const videoActor = alreadyLoadedActor?.url && alreadyLoadedActor?.followersUrl
+    ? alreadyLoadedActor
     : await ActorModel.loadAccountActorFollowerUrlByVideoId(video.id, t)
 
   actors.push(videoActor)

server/core/lib/activitypub/video-comments.ts

@@ -173,6 +173,8 @@ async function resolveRemoteParentComment (params: ResolveThreadParams) {
   }) as MCommentOwner
   comment.Account = actor ? actor.Account : null
 
+  logger.debug('Created remote comment %s', comment.url, { comment })
+
   return resolveThread({
     url: body.inReplyTo,
     comments: comments.concat([ comment ]),

server/core/models/video/video-comment.ts

@@ -71,12 +71,26 @@ export enum ScopeNames {
         required: true,
         include: [
           {
-            model: VideoChannelModel,
+            model: VideoChannelModel.unscoped(),
+            attributes: [ 'id', 'accountId' ],
             required: true,
             include: [
               {
-                model: AccountModel,
+                attributes: [ 'id', 'url' ],
+                model: ActorModel.unscoped(),
                 required: true
+              },
+              {
+                attributes: [ 'id' ],
+                model: AccountModel.unscoped(),
+                required: true,
+                include: [
+                  {
+                    attributes: [ 'id', 'url' ],
+                    model: ActorModel.unscoped(),
+                    required: true
+                  }
+                ]
               }
             ]
           }

server/core/types/models/video/video-channel.ts

@@ -5,6 +5,7 @@ import {
   MAccountAPI,
   MAccountDefault,
   MAccountFormattable,
+  MAccountId,
   MAccountLight,
   MAccountSummaryBlocks,
   MAccountSummaryFormattable,
@@ -22,6 +23,7 @@ import {
   MActorFormattable,
   MActorHost,
   MActorHostOnly,
+  MActorId,
   MActorLight,
   MActorSummary,
   MActorSummaryFormattable,
@@ -49,6 +51,11 @@ export type MChannelUserId =
   Pick<MChannel, 'accountId'> &
   Use<'Account', MAccountUserId>
 
+export type MChannelAccountIdUrl =
+  Pick<MChannel, 'id' | 'accountId'> &
+  Use<'Actor', MActorUrl & MActorId> &
+  Use<'Account', MAccountId & MAccountUrl>
+
 export type MChannelActor =
   MChannel &
   Use<'Actor', MActor>

server/core/types/models/video/video-comment.ts

@@ -1,7 +1,7 @@
 import { PickWith, PickWithOpt } from '@peertube/peertube-typescript-utils'
 import { VideoCommentModel } from '../../../models/video/video-comment.js'
 import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account/index.js'
-import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video.js'
+import { MVideo, MVideoAccountIdUrl, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video.js'
 
 type Use<K extends keyof VideoCommentModel, M> = PickWith<VideoCommentModel, K, M>
 
@@ -29,12 +29,12 @@ export type MCommentReply =
 export type MCommentOwnerVideo =
   MComment &
   Use<'Account', MAccountDefault> &
-  Use<'Video', MVideoAccountLight>
+  Use<'Video', MVideoAccountIdUrl>
 
 export type MCommentOwnerVideoReply =
   MComment &
   Use<'Account', MAccountDefault> &
-  Use<'Video', MVideoAccountLight> &
+  Use<'Video', MVideoAccountIdUrl> &
   Use<'InReplyToVideoComment', MComment>
 
 export type MCommentOwnerReplyVideoLight =

server/core/types/models/video/video.ts

@@ -10,6 +10,7 @@ import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } fro
 import { MVideoCaptionLanguage, MVideoCaptionLanguageUrl } from './video-caption.js'
 import {
   MChannelAccountDefault,
+  MChannelAccountIdUrl,
   MChannelAccountLight,
   MChannelAccountSummaryFormattable,
   MChannelActor,
@@ -136,6 +137,10 @@ export type MVideoAccountDefault =
   MVideo &
   Use<'VideoChannel', MChannelAccountDefault>
 
+export type MVideoAccountIdUrl =
+  MVideo &
+  Use<'VideoChannel', MChannelAccountIdUrl>
+
 export type MVideoThumbnailAccountDefault =
   MVideo &
   Use<'Thumbnails', MThumbnail[]> &