aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-06-17 16:16:28 +0200
committerChocobozzz <me@florianbigard.com>2022-06-17 16:23:13 +0200
commit5e0dbb3e52797cdea7a9069a9dd605c8f84034dd (patch)
treed885f6f1e20c201d7493cd0cd7220416f5a71d01
parent82eb78504ff6b8ed06aa28de48930fe0f21541fe (diff)
downloadPeerTube-5e0dbb3e52797cdea7a9069a9dd605c8f84034dd.tar.gz
PeerTube-5e0dbb3e52797cdea7a9069a9dd605c8f84034dd.tar.zst
PeerTube-5e0dbb3e52797cdea7a9069a9dd605c8f84034dd.zip
Fix users stats
-rw-r--r--server/models/user/user.ts4
-rw-r--r--server/models/video/video-comment.ts4
-rw-r--r--server/models/video/video-playlist.ts4
-rw-r--r--server/tests/api/server/stats.ts4
4 files changed, 10 insertions, 6 deletions
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>>> {
819 } 819 }
820 } 820 }
821 821
822 return UserModel.count(query) 822 return UserModel.unscoped().count(query)
823 } 823 }
824 824
825 const totalUsers = await UserModel.count() 825 const totalUsers = await UserModel.unscoped().count()
826 const totalDailyActiveUsers = await getActiveUsers(1) 826 const totalDailyActiveUsers = await getActiveUsers(1)
827 const totalWeeklyActiveUsers = await getActiveUsers(7) 827 const totalWeeklyActiveUsers = await getActiveUsers(7)
828 const totalMonthlyActiveUsers = await getActiveUsers(30) 828 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
683 const totalLocalVideoComments = await VideoCommentModel.count({ 683 const totalLocalVideoComments = await VideoCommentModel.count({
684 include: [ 684 include: [
685 { 685 {
686 model: AccountModel, 686 model: AccountModel.unscoped(),
687 required: true, 687 required: true,
688 include: [ 688 include: [
689 { 689 {
690 model: ActorModel, 690 model: ActorModel.unscoped(),
691 required: true, 691 required: true,
692 where: { 692 where: {
693 serverId: null 693 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
617 const totalLocalPlaylists = await VideoPlaylistModel.count({ 617 const totalLocalPlaylists = await VideoPlaylistModel.count({
618 include: [ 618 include: [
619 { 619 {
620 model: AccountModel, 620 model: AccountModel.unscoped(),
621 required: true, 621 required: true,
622 include: [ 622 include: [
623 { 623 {
624 model: ActorModel, 624 model: ActorModel.unscoped(),
625 required: true, 625 required: true,
626 where: { 626 where: {
627 serverId: null 627 serverId: null
diff --git a/server/tests/api/server/stats.ts b/server/tests/api/server/stats.ts
index a9ae236fb..6654eaaee 100644
--- a/server/tests/api/server/stats.ts
+++ b/server/tests/api/server/stats.ts
@@ -10,6 +10,8 @@ import {
10 doubleFollow, 10 doubleFollow,
11 PeerTubeServer, 11 PeerTubeServer,
12 setAccessTokensToServers, 12 setAccessTokensToServers,
13 setDefaultAccountAvatar,
14 setDefaultChannelAvatar,
13 waitJobs 15 waitJobs
14} from '@shared/server-commands' 16} from '@shared/server-commands'
15 17
@@ -29,6 +31,8 @@ describe('Test stats (excluding redundancy)', function () {
29 servers = await createMultipleServers(3) 31 servers = await createMultipleServers(3)
30 32
31 await setAccessTokensToServers(servers) 33 await setAccessTokensToServers(servers)
34 await setDefaultChannelAvatar(servers)
35 await setDefaultAccountAvatar(servers)
32 36
33 await doubleFollow(servers[0], servers[1]) 37 await doubleFollow(servers[0], servers[1])
34 38