diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-11-17 20:50:05 -0600 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-17 20:50:05 -0600 |
| commit | 68fa5ca1b7c2ea8cb4bb1bcfa17210457f3df6b6 (patch) | |
| tree | 0021efa6c04cdad9d2adeb087531edc51afdfe39 | |
| parent | d9e6204cd6293d747f6051166aff52f3f2b1b410 (diff) | |
The streaming server can now apply users' regex filters before sending content to their timelines.`Ia PostgreSQL fthaghn`.
| -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 ff375a894..01bd6ea95 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -372,7 +372,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, 3)})) 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, 3)}) UNION SELECT 1 FROM statuses WHERE id = $3 AND normalized_text ~ ANY(ARRAY(SELECT unaccent(lower(phrase)) FROM custom_filters WHERE account_id = $1)) UNION SELECT 1 FROM media_attachments WHERE (1 = (SELECT 1 FROM accounts WHERE id = $1 AND filter_undescribed)) AND status_id = $3 AND description IS NULL LIMIT 1`, [req.accountId, unpackedPayload.account.id, unpackedPayload.id].concat(targetAccountIds)), ]; if (accountDomain) { |