diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-03-15 22:55:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 22:55:22 +0100 |
| commit | e245115f47082ffba27205f508301d14e792c369 (patch) | |
| tree | 21a77b788dace45b734da6e64f1b0705016192f0 /streaming/index.js | |
| parent | 620f70e42c16c324459ca2da52c68f1def8683de (diff) | |
| parent | c1124228e857b0e85f5bf927d2c41c7fadfdf955 (diff) | |
Merge branch 'master' into mastodon-site-api
Diffstat (limited to 'streaming/index.js')
| -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 125b35bb4..0f838e411 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -164,7 +164,7 @@ const streamFrom = (id, req, output, attachCloseHandler, needsFiltering = false) const unpackedPayload = JSON.parse(payload) const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id)).concat(unpackedPayload.reblog ? [unpackedPayload.reblog.account.id] : []) - client.query(`SELECT target_account_id FROM blocks WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)})`, [req.accountId].concat(targetAccountIds), (err, result) => { + client.query(`SELECT target_account_id FROM blocks WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)}) UNION SELECT target_account_id FROM mutes WHERE account_id = $1 AND target_account_id IN (${placeholders(targetAccountIds, 1)})`, [req.accountId].concat(targetAccountIds), (err, result) => { done() if (err) { |