diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-15 02:11:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 02:11:22 +0100 |
| commit | eb675af0fb0d73b697e066100c4faf066c0baff7 (patch) | |
| tree | c4a449a9d3cb1f513d8ba45b368e44e98c2b4ce4 | |
| parent | ceafd1f68f1f1b57c998adf693678059f9aaa70c (diff) | |
| parent | 66461ae79ab407beaaf41a3b5b939f2cc7e6936e (diff) | |
Merge pull request #1932 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
| -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 53a790ea0..cecb53ed5 100644 --- a/streaming/index.js +++ b/streaming/index.js @@ -690,7 +690,7 @@ const startWorker = async (workerId) => { } if (!unpackedPayload.filtered && !req.cachedFilters) { - queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND filter.expires_at IS NULL OR filter.expires_at > NOW()', [req.accountId])); + queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND (filter.expires_at IS NULL OR filter.expires_at > NOW())', [req.accountId])); } Promise.all(queries).then(values => { |