From d3976db269a0e5a3256867a7fc614d3c54c58720 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 17 Jun 2022 16:06:58 +0200
Subject: Fix searching in blocklist

---
 server/models/account/account-blocklist.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'server/models')

diff --git a/server/models/account/account-blocklist.ts b/server/models/account/account-blocklist.ts
index a7b8db076..377249b38 100644
--- a/server/models/account/account-blocklist.ts
+++ b/server/models/account/account-blocklist.ts
@@ -132,6 +132,20 @@ export class AccountBlocklistModel extends Model<Partial<AttributesOnly<AccountB
             as: 'BlockedAccount'
           }
         ]
+      } else if (search) { // We need some joins when counting with search
+        query.include = [
+          {
+            model: AccountModel.unscoped(),
+            required: true,
+            as: 'BlockedAccount',
+            include: [
+              {
+                model: ActorModel.unscoped(),
+                required: true
+              }
+            ]
+          }
+        ]
       }
 
       return query
-- 
cgit v1.2.3


From 5e0dbb3e52797cdea7a9069a9dd605c8f84034dd Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Fri, 17 Jun 2022 16:16:28 +0200
Subject: Fix users stats

---
 server/models/user/user.ts            | 4 ++--
 server/models/video/video-comment.ts  | 4 ++--
 server/models/video/video-playlist.ts | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server/models')

diff --git a/server/models/user/user.ts b/server/models/user/user.ts
index 326b2e789..68b2bf523 100644
--- a/server/models/user/user.ts
+++ b/server/models/user/user.ts
@@ -819,10 +819,10 @@ export class UserModel extends Model<Partial<AttributesOnly<UserModel>>> {
         }
       }
 
-      return UserModel.count(query)
+      return UserModel.unscoped().count(query)
     }
 
-    const totalUsers = await UserModel.count()
+    const totalUsers = await UserModel.unscoped().count()
     const totalDailyActiveUsers = await getActiveUsers(1)
     const totalWeeklyActiveUsers = await getActiveUsers(7)
     const totalMonthlyActiveUsers = await getActiveUsers(30)
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts
index 2d60c6a30..1d3178164 100644
--- a/server/models/video/video-comment.ts
+++ b/server/models/video/video-comment.ts
@@ -683,11 +683,11 @@ export class VideoCommentModel extends Model<Partial<AttributesOnly<VideoComment
     const totalLocalVideoComments = await VideoCommentModel.count({
       include: [
         {
-          model: AccountModel,
+          model: AccountModel.unscoped(),
           required: true,
           include: [
             {
-              model: ActorModel,
+              model: ActorModel.unscoped(),
               required: true,
               where: {
                 serverId: null
diff --git a/server/models/video/video-playlist.ts b/server/models/video/video-playlist.ts
index 8fb3d5f15..00cca0549 100644
--- a/server/models/video/video-playlist.ts
+++ b/server/models/video/video-playlist.ts
@@ -617,11 +617,11 @@ export class VideoPlaylistModel extends Model<Partial<AttributesOnly<VideoPlayli
     const totalLocalPlaylists = await VideoPlaylistModel.count({
       include: [
         {
-          model: AccountModel,
+          model: AccountModel.unscoped(),
           required: true,
           include: [
             {
-              model: ActorModel,
+              model: ActorModel.unscoped(),
               required: true,
               where: {
                 serverId: null
-- 
cgit v1.2.3