about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-14 03:59:31 +0200
committerGitHub <noreply@github.com>2018-07-14 03:59:31 +0200
commit0180037dfb45b80c3e3a04bc9cfb69fae1da37c0 (patch)
tree868cd01721ba0fc8f2a554be8dc7dff2097aa6d4
parent5a6645c922a68ba4f56db5d0082cdc58bb1ac746 (diff)
Fix streaming API still using filtered instead of chosen languages (#8009)
-rw-r--r--streaming/index.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/streaming/index.js b/streaming/index.js
index 4eaf66865..d7bfa6542 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -192,7 +192,7 @@ const startWorker = (workerId) => {
         return;
       }
 
-      client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.filtered_languages FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
+      client.query('SELECT oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token], (err, result) => {
         done();
 
         if (err) {
@@ -209,7 +209,7 @@ const startWorker = (workerId) => {
         }
 
         req.accountId = result.rows[0].account_id;
-        req.filteredLanguages = result.rows[0].filtered_languages;
+        req.chosenLanguages = result.rows[0].chosen_languages;
 
         next();
       });
@@ -340,7 +340,7 @@ const startWorker = (workerId) => {
       const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id));
       const accountDomain    = unpackedPayload.account.acct.split('@')[1];
 
-      if (Array.isArray(req.filteredLanguages) && req.filteredLanguages.indexOf(unpackedPayload.language) !== -1) {
+      if (Array.isArray(req.chosenLanguages) && unpackedPayload.language !== null && req.chosenLanguages.indexOf(unpackedPayload.language) === -1) {
         log.silly(req.requestId, `Message ${unpackedPayload.id} filtered by language (${unpackedPayload.language})`);
         return;
       }