Add ability to mute a user/instance by server in client

2 files changed, 6 insertions, 4 deletions

diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 08c6b3ff0..dd6d08139 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -294,7 +294,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
   static async listThreadsForApi (videoId: number, start: number, count: number, sort: string, user?: UserModel) {
     const serverActor = await getServerActor()
     const serverAccountId = serverActor.Account.id
-    const userAccountId = user.Account.id
+    const userAccountId = user ? user.Account.id : undefined
 
     const query = {
       offset: start,
@@ -330,7 +330,7 @@ export class VideoCommentModel extends Model<VideoCommentModel> {
   static async listThreadCommentsForApi (videoId: number, threadId: number, user?: UserModel) {
     const serverActor = await getServerActor()
     const serverAccountId = serverActor.Account.id
-    const userAccountId = user.Account.id
+    const userAccountId = user ? user.Account.id : undefined
 
     const query = {
       order: [ [ 'createdAt', 'ASC' ], [ 'updatedAt', 'ASC' ] ],
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index eab99cba7..6c183933b 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1255,9 +1255,11 @@ export class VideoModel extends Model<VideoModel> {
 
   // threshold corresponds to how many video the field should have to be returned
   static async getRandomFieldSamples (field: 'category' | 'channelId', threshold: number, count: number) {
-    const actorId = (await getServerActor()).id
+    const serverActor = await getServerActor()
+    const actorId = serverActor.id
 
-    const scopeOptions = {
+    const scopeOptions: AvailableForListIDsOptions = {
+      serverAccountId: serverActor.Account.id,
       actorId,
       includeLocalVideos: true
     }