From 4c85cf4a32e85bf050e2a062277519b2fa885209 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Thu, 30 Aug 2018 17:42:21 -0500 Subject: [PATCH] Fix #3853: Blacklist minscore is broken. --- app/javascript/src/javascripts/blacklists.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/javascript/src/javascripts/blacklists.js b/app/javascript/src/javascripts/blacklists.js index 3264dd67e..a1e238e65 100644 --- a/app/javascript/src/javascripts/blacklists.js +++ b/app/javascript/src/javascripts/blacklists.js @@ -147,10 +147,7 @@ Blacklist.post_match = function(post, entry) { var $post = $(post); var score = parseInt($post.attr("data-score")); - - if (entry.min_score !== null && score < entry.min_score) { - return true; - } + var score_test = entry.min_score === null || score < entry.min_score; var tags = String($post.attr("data-tags")).match(/\S+/g) || []; tags = tags.concat(String($post.attr("data-pools")).match(/\S+/g) || []); @@ -164,7 +161,7 @@ Blacklist.post_match = function(post, entry) { tags.push("status:" + v); }); - return Utility.is_subset(tags, entry.require) + return (Utility.is_subset(tags, entry.require) && score_test) && (!entry.optional.length || Utility.intersect(tags, entry.optional).length) && !Utility.intersect(tags, entry.exclude).length; }