diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-20 10:23:19 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-20 10:23:19 +0200 |
commit | 714e33a7428b71ef98129ce85a4bd64140bcd912 (patch) | |
tree | 59bd3e4b359bcd04f4ad97c404246688ccd84e68 /server/models/video | |
parent | aa2ce188d102ab38452df316d06286040b5d9075 (diff) | |
parent | d47b18079bfe4aed472ddcc0a89302ba85f03a48 (diff) | |
download | PeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.tar.gz PeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.tar.zst PeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.zip |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'server/models/video')
-rw-r--r-- | server/models/video/video-comment.ts | 4 | ||||
-rw-r--r-- | server/models/video/video-playlist.ts | 4 |
2 files changed, 4 insertions, 4 deletions
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 |