yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 10:19:35 +02:00
Code Issues Releases Wiki Activity

Fix video comments display with deleted comments

Browse source
This commit is contained in:
Chocobozzz 2021-02-19 09:50:13 +01:00
parent fae6e4da8f
commit 9d6b9d10ef
No known key found for this signature in database
GPG key ID: 583A612D890159BE
11 changed files with 118 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/models/utils.ts
View file

@ -134,7 +134,7 @@ function buildBlockedAccountSQL (blockerIds: number[]) {
const blockerIdsString = blockerIds.join(', ')
return 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' +
' UNION ALL ' +
' UNION ' +
'SELECT "account"."id" AS "id" FROM account INNER JOIN "actor" ON account."actorId" = actor.id ' +
'INNER JOIN "serverBlocklist" ON "actor"."serverId" = "serverBlocklist"."targetServerId" ' +
'WHERE "serverBlocklist"."accountId" IN (' + blockerIdsString + ')'