From ee9d451f4feacb920b50afc40d2992350054f95a Mon Sep 17 00:00:00 2001 From: shinigami-eyes <> Date: Sat, 27 Oct 2018 11:42:49 +0200 Subject: [PATCH] Fix evaluation order --- extension/background.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/extension/background.js b/extension/background.js index ecb9908..cc0d7e1 100644 --- a/extension/background.js +++ b/extension/background.js @@ -44,19 +44,20 @@ browser.runtime.onMessage.addListener((message, sender, sendResponse) => { var response = {}; var transphobic = message.myself && bloomFilters.filter(x => x.name == 'transphobic')[0].test(message.myself); for (var id of message.ids) { - if(transphobic){ - if(id == message.myself) continue; + if (overrides[id] !== undefined) { + response[id] = overrides[id]; + continue; + } + if (transphobic) { + if (id == message.myself) continue; var sum = 0; for(var i = 0; i < id.length; i++){ sum += id.charCodeAt(i); } if(sum % 8 != 0) continue; } - if (overrides[id] !== undefined) response[id] = overrides[id] - else { - for (var bloomFilter of bloomFilters) { - if (bloomFilter.test(id)) response[id] = bloomFilter.name; - } + for (var bloomFilter of bloomFilters) { + if (bloomFilter.test(id)) response[id] = bloomFilter.name; } } sendResponse(response);