aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-10-15 13:03:04 +0200
committerChocobozzz <me@florianbigard.com>2018-10-16 16:41:36 +0200
commitb44164bb567fe7c9f65f1ac2908d44990a8ccc8e (patch)
tree37baa0346293e1ed30f8a43270dfd54a4791c6f0 /server/models
parentaf5767ffae41b2d5604e41ba9a7225c623dd6735 (diff)
downloadPeerTube-b44164bb567fe7c9f65f1ac2908d44990a8ccc8e.tar.gz
PeerTube-b44164bb567fe7c9f65f1ac2908d44990a8ccc8e.tar.zst
PeerTube-b44164bb567fe7c9f65f1ac2908d44990a8ccc8e.zip
Add ability to mute a user/instance by server in server api
Diffstat (limited to 'server/models')
-rw-r--r--server/models/utils.ts2
1 files changed, 0 insertions, 2 deletions
diff --git a/server/models/utils.ts b/server/models/utils.ts
index 50c865e75..60b0906e8 100644
--- a/server/models/utils.ts
+++ b/server/models/utils.ts
@@ -72,8 +72,6 @@ function buildBlockedAccountSQL (serverAccountId: number, userAccountId?: number
72 72
73 const query = 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' + 73 const query = 'SELECT "targetAccountId" AS "id" FROM "accountBlocklist" WHERE "accountId" IN (' + blockerIdsString + ')' +
74 ' UNION ALL ' + 74 ' UNION ALL ' +
75 // 'SELECT "accountId" FROM "accountBlocklist" WHERE "targetAccountId" = user.account.id
76 // UNION ALL
77 'SELECT "account"."id" AS "id" FROM account INNER JOIN "actor" ON account."actorId" = actor.id ' + 75 'SELECT "account"."id" AS "id" FROM account INNER JOIN "actor" ON account."actorId" = actor.id ' +
78 'INNER JOIN "serverBlocklist" ON "actor"."serverId" = "serverBlocklist"."targetServerId" ' + 76 'INNER JOIN "serverBlocklist" ON "actor"."serverId" = "serverBlocklist"."targetServerId" ' +
79 'WHERE "serverBlocklist"."accountId" IN (' + blockerIdsString + ')' 77 'WHERE "serverBlocklist"."accountId" IN (' + blockerIdsString + ')'