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

Merge pull request #3827 from evazion/fix-3709

Browse Source 
Fix #3709: Provide OR capability for blacklist items
This commit is contained in:
Albert Yi
2018-08-23 13:54:30 -07:00
committed by GitHub
parent d8a6cee244 d6eecb5466
commit 54363ffecf
7 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ Blacklist.parse_entry = function(string) {
"tags": string,
"require": [],
"exclude": [],
"optional": [],
"disabled": false,
"hits": 0,
"min_score": null
@@ -18,6 +19,8 @@ Blacklist.parse_entry = function(string) {
$.each(matches, function(i, tag) {
if (tag.charAt(0) === '-') {
entry.exclude.push(tag.slice(1));
} else if (tag.charAt(0) === '~') {
entry.optional.push(tag.slice(1));
} else if (tag.match(/^score:<.+/)) {
var score = tag.match(/^score:<(.+)/)[1];
entry.min_score = parseInt(score);
@@ -30,6 +33,7 @@ Blacklist.parse_entry = function(string) {
Blacklist.parse_entries = function() {
var entries = (Utility.meta("blacklisted-tags") || "nozomiisthebestlovelive").replace(/(rating:[qes])\w+/ig, "$1").toLowerCase().split(/,/);
entries = entries.filter(e => e.trim() !== "");
$.each(entries, function(i, tags) {
var entry = Blacklist.parse_entry(tags);
@@ -51,6 +55,7 @@ Blacklist.toggle_entry = function(e) {
}
}
Blacklist.apply();
e.preventDefault();
}
Blacklist.update_sidebar = function() {
@@ -64,6 +69,8 @@ Blacklist.update_sidebar = function() {
var count = $("<span/>");
link.text(entry.tags);
link.attr("href", `/posts?tags=${encodeURIComponent(entry.tags)}`);
link.attr("title", entry.tags);
link.click(Blacklist.toggle_entry);
count.html(entry.hits);
count.addClass("count");
@@ -156,7 +163,10 @@ Blacklist.post_match = function(post, entry) {
$.each(String($post.data("flags")).match(/\S+/g) || [], function(i, v) {
tags.push("status:" + v);
});
return (entry.require.length > 0 || entry.exclude.length > 0) && Utility.is_subset(tags, entry.require) && !Utility.intersect(tags, entry.exclude).length;
return Utility.is_subset(tags, entry.require)
&& (!entry.optional.length || Utility.intersect(tags, entry.optional).length)
&& !Utility.intersect(tags, entry.exclude).length;
}
Blacklist.post_hide = function(post) {