jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #3853: Blacklist minscore is broken.

Browse Source
This commit is contained in:
BrokenEagle
2018-08-30 17:42:21 -05:00
committed by evazion
parent a68d12bd45
commit 4c85cf4a32
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/src/javascripts/blacklists.js
View File

@@ -147,10 +147,7 @@ Blacklist.post_match = function(post, entry) {
var $post = $(post); var $post = $(post);
var score = parseInt($post.attr("data-score")); var score = parseInt($post.attr("data-score"));
var score_test = entry.min_score === null || score < entry.min_score;
if (entry.min_score !== null && score < entry.min_score) {
return true;
}
var tags = String($post.attr("data-tags")).match(/\S+/g) || []; var tags = String($post.attr("data-tags")).match(/\S+/g) || [];
tags = tags.concat(String($post.attr("data-pools")).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); 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) && (!entry.optional.length || Utility.intersect(tags, entry.optional).length)
&& !Utility.intersect(tags, entry.exclude).length; && !Utility.intersect(tags, entry.exclude).length;
} }