diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:05:45 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-17 12:08:35 -0500 |
| commit | e56e3d187f8ddd3db72fc90c5d200f552d5c1c04 (patch) | |
| tree | 59204082c7f9731d301716f08865f8639149452c /streaming | |
| parent | 4a1b8bcf34ce834ee8c30f1ac94c29f4e56a2b41 (diff) | |
[Filters] Merge thread muting and hiding into a single action
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/streaming/index.js b/streaming/index.js index 3a68e6de5..62f6b5fe0 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -578,7 +578,7 @@ const startWorker = (workerId) => { } const queries = [ - client.query(`SELECT 1 FROM blocks WHERE (account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 2)})) OR (account_id = $2 AND target_account_id = $1) UNION SELECT 1 FROM mutes WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 2)})`, [req.accountId, unpackedPayload.account.id].concat(targetAccountIds)), + client.query(`SELECT 1 FROM blocks WHERE (account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 4)})) OR (account_id = $2 AND target_account_id = $1) UNION SELECT 1 FROM mutes WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 4)}) UNION SELECT 1 FROM conversation_mutes WHERE account_id = $1 AND conversation_id = $3 UNION SELECT 1 FROM status_mutes WHERE account_id = $1 AND status_id = $4`, [req.accountId, unpackedPayload.account.id, unpackedPayload.conversation_id, unpackedPayload.id].concat(targetAccountIds)), ]; if (accountDomain) { |