mirror of https://github.com/Chocobozzz/PeerTube
Don't count deleted comment for replies
parent
b110820dfc
commit
99cb53fd5a
|
@ -69,14 +69,10 @@ export enum ScopeNames {
|
|||
Sequelize.literal(
|
||||
'(' +
|
||||
'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' +
|
||||
'SELECT COUNT("replies"."id") - (' +
|
||||
'SELECT COUNT("replies"."id") ' +
|
||||
'FROM "videoComment" AS "replies" ' +
|
||||
'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' +
|
||||
'AND "accountId" IN (SELECT "id" FROM "blocklist")' +
|
||||
')' +
|
||||
'SELECT COUNT("replies"."id") ' +
|
||||
'FROM "videoComment" AS "replies" ' +
|
||||
'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' +
|
||||
'AND "deletedAt" IS NULL ' +
|
||||
'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' +
|
||||
')'
|
||||
),
|
||||
|
|
|
@ -934,7 +934,7 @@ describe('Test multiple servers', function () {
|
|||
expect(deletedComment.text).to.equal('')
|
||||
expect(deletedComment.inReplyToCommentId).to.be.null
|
||||
expect(deletedComment.account).to.be.null
|
||||
expect(deletedComment.totalReplies).to.equal(3)
|
||||
expect(deletedComment.totalReplies).to.equal(2)
|
||||
expect(dateIsValid(deletedComment.createdAt as string)).to.be.true
|
||||
expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true
|
||||
expect(dateIsValid(deletedComment.deletedAt as string)).to.be.true
|
||||
|
@ -976,7 +976,7 @@ describe('Test multiple servers', function () {
|
|||
expect(comment.createdAt).to.not.be.null
|
||||
expect(comment.deletedAt).to.not.be.null
|
||||
expect(comment.account).to.be.null
|
||||
expect(comment.totalReplies).to.equal(3)
|
||||
expect(comment.totalReplies).to.equal(2)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -231,7 +231,7 @@ describe('Test video comments', function () {
|
|||
expect(res.body.data[0].isDeleted).to.be.true
|
||||
expect(res.body.data[0].deletedAt).to.not.be.null
|
||||
expect(res.body.data[0].account).to.be.null
|
||||
expect(res.body.data[0].totalReplies).to.equal(3)
|
||||
expect(res.body.data[0].totalReplies).to.equal(2)
|
||||
expect(res.body.data[1].text).to.equal('super thread 2')
|
||||
expect(res.body.data[1].totalReplies).to.equal(0)
|
||||
expect(res.body.data[2].text).to.equal('super thread 3')
|
||||
|
|
Loading…
Reference in New Issue