diff options
-rw-r--r-- | server/models/video/video-comment.ts | 8 | ||||
-rw-r--r-- | server/tests/api/videos/multiple-servers.ts | 4 | ||||
-rw-r--r-- | server/tests/api/videos/video-comments.ts | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index bdf5d86bc..e1faf2b9a 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts | |||
@@ -69,14 +69,10 @@ export enum ScopeNames { | |||
69 | Sequelize.literal( | 69 | Sequelize.literal( |
70 | '(' + | 70 | '(' + |
71 | 'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' + | 71 | 'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' + |
72 | 'SELECT COUNT("replies"."id") - (' + | 72 | 'SELECT COUNT("replies"."id") ' + |
73 | 'SELECT COUNT("replies"."id") ' + | ||
74 | 'FROM "videoComment" AS "replies" ' + | ||
75 | 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + | ||
76 | 'AND "accountId" IN (SELECT "id" FROM "blocklist")' + | ||
77 | ')' + | ||
78 | 'FROM "videoComment" AS "replies" ' + | 73 | 'FROM "videoComment" AS "replies" ' + |
79 | 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + | 74 | 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + |
75 | 'AND "deletedAt" IS NULL ' + | ||
80 | 'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' + | 76 | 'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' + |
81 | ')' | 77 | ')' |
82 | ), | 78 | ), |
diff --git a/server/tests/api/videos/multiple-servers.ts b/server/tests/api/videos/multiple-servers.ts index 6aa996038..e80d69cf3 100644 --- a/server/tests/api/videos/multiple-servers.ts +++ b/server/tests/api/videos/multiple-servers.ts | |||
@@ -934,7 +934,7 @@ describe('Test multiple servers', function () { | |||
934 | expect(deletedComment.text).to.equal('') | 934 | expect(deletedComment.text).to.equal('') |
935 | expect(deletedComment.inReplyToCommentId).to.be.null | 935 | expect(deletedComment.inReplyToCommentId).to.be.null |
936 | expect(deletedComment.account).to.be.null | 936 | expect(deletedComment.account).to.be.null |
937 | expect(deletedComment.totalReplies).to.equal(3) | 937 | expect(deletedComment.totalReplies).to.equal(2) |
938 | expect(dateIsValid(deletedComment.createdAt as string)).to.be.true | 938 | expect(dateIsValid(deletedComment.createdAt as string)).to.be.true |
939 | expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true | 939 | expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true |
940 | expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true | 940 | expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true |
@@ -976,7 +976,7 @@ describe('Test multiple servers', function () { | |||
976 | expect(comment.createdAt).to.not.be.null | 976 | expect(comment.createdAt).to.not.be.null |
977 | expect(comment.deletedAt).to.not.be.null | 977 | expect(comment.deletedAt).to.not.be.null |
978 | expect(comment.account).to.be.null | 978 | expect(comment.account).to.be.null |
979 | expect(comment.totalReplies).to.equal(3) | 979 | expect(comment.totalReplies).to.equal(2) |
980 | } | 980 | } |
981 | } | 981 | } |
982 | }) | 982 | }) |
diff --git a/server/tests/api/videos/video-comments.ts b/server/tests/api/videos/video-comments.ts index a5ff3a39d..b6b002307 100644 --- a/server/tests/api/videos/video-comments.ts +++ b/server/tests/api/videos/video-comments.ts | |||
@@ -231,7 +231,7 @@ describe('Test video comments', function () { | |||
231 | expect(res.body.data[0].isDeleted).to.be.true | 231 | expect(res.body.data[0].isDeleted).to.be.true |
232 | expect(res.body.data[0].deletedAt).to.not.be.null | 232 | expect(res.body.data[0].deletedAt).to.not.be.null |
233 | expect(res.body.data[0].account).to.be.null | 233 | expect(res.body.data[0].account).to.be.null |
234 | expect(res.body.data[0].totalReplies).to.equal(3) | 234 | expect(res.body.data[0].totalReplies).to.equal(2) |
235 | expect(res.body.data[1].text).to.equal('super thread 2') | 235 | expect(res.body.data[1].text).to.equal('super thread 2') |
236 | expect(res.body.data[1].totalReplies).to.equal(0) | 236 | expect(res.body.data[1].totalReplies).to.equal(0) |
237 | expect(res.body.data[2].text).to.equal('super thread 3') | 237 | expect(res.body.data[2].text).to.equal('super thread 3') |