interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't count deleted comment for replies

This commit is contained in:
Chocobozzz 2021-06-08 13:34:40 +02:00
parent b110820dfc
commit 99cb53fd5a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/models/video/video-comment.ts
View File

@ -69,14 +69,10 @@ export enum ScopeNames {
Sequelize.literal( Sequelize.literal(
'(' + '(' +
'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' + 'WITH "blocklist" AS (' + buildBlockedAccountSQL(blockerAccountIds) + ')' +
'SELECT COUNT("replies"."id") - (' +
'SELECT COUNT("replies"."id") ' + 'SELECT COUNT("replies"."id") ' +
'FROM "videoComment" AS "replies" ' + 'FROM "videoComment" AS "replies" ' +
'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' + 'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' +
'AND "accountId" IN (SELECT "id" FROM "blocklist")' + 'AND "deletedAt" IS NULL ' +
')' +
'FROM "videoComment" AS "replies" ' +
'WHERE "replies"."originCommentId" = "VideoCommentModel"."id" ' +
'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' + 'AND "accountId" NOT IN (SELECT "id" FROM "blocklist")' +
')' ')'
), ),

4
server/tests/api/videos/multiple-servers.ts
View File

@ -934,7 +934,7 @@ describe('Test multiple servers', function () {
expect(deletedComment.text).to.equal('') expect(deletedComment.text).to.equal('')
expect(deletedComment.inReplyToCommentId).to.be.null expect(deletedComment.inReplyToCommentId).to.be.null
expect(deletedComment.account).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.createdAt as string)).to.be.true
expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true expect(dateIsValid(deletedComment.updatedAt as string)).to.be.true
expect(dateIsValid(deletedComment.deletedAt 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.createdAt).to.not.be.null
expect(comment.deletedAt).to.not.be.null expect(comment.deletedAt).to.not.be.null
expect(comment.account).to.be.null expect(comment.account).to.be.null
expect(comment.totalReplies).to.equal(3) expect(comment.totalReplies).to.equal(2)
} }
} }
}) })

2
server/tests/api/videos/video-comments.ts
View File

@ -231,7 +231,7 @@ describe('Test video comments', function () {
expect(res.body.data[0].isDeleted).to.be.true expect(res.body.data[0].isDeleted).to.be.true
expect(res.body.data[0].deletedAt).to.not.be.null expect(res.body.data[0].deletedAt).to.not.be.null
expect(res.body.data[0].account).to.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].text).to.equal('super thread 2')
expect(res.body.data[1].totalReplies).to.equal(0) expect(res.body.data[1].totalReplies).to.equal(0)
expect(res.body.data[2].text).to.equal('super thread 3') expect(res.body.data[2].text).to.equal('super thread 3')