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

Merge pull request #4342 from BrokenEagle/fix-blacklist-with-children

Browse Source 
Only count unique post IDs for blacklist menu
This commit is contained in:
evazion
2020-03-20 15:48:01 -05:00
committed by GitHub
parent f7175d3b12 052c039ce8
commit 844bacb890
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@ Blacklist.toggle_entry = function(e) {
Blacklist.update_sidebar = function() { Blacklist.update_sidebar = function() {
Blacklist.entries.forEach(function(entry) { Blacklist.entries.forEach(function(entry) {
if (entry.hits === 0) { if (entry.hits.length === 0) {
return; return;
} }
@@ -72,7 +72,8 @@ Blacklist.update_sidebar = function() {
link.attr("href", `/posts?tags=${encodeURIComponent(entry.tags)}`); link.attr("href", `/posts?tags=${encodeURIComponent(entry.tags)}`);
link.attr("title", entry.tags); link.attr("title", entry.tags);
link.on("click.danbooru", Blacklist.toggle_entry); link.on("click.danbooru", Blacklist.toggle_entry);
count.html(entry.hits); let unique_hits = new Set(entry.hits).size;
count.html(unique_hits);
count.addClass("count"); count.addClass("count");
item.append(link); item.append(link);
item.append(" "); item.append(" ");
@@ -128,7 +129,7 @@ Blacklist.initialize_disable_all_blacklists = function() {
Blacklist.apply = function() { Blacklist.apply = function() {
Blacklist.entries.forEach(function(entry) { Blacklist.entries.forEach(function(entry) {
entry.hits = 0; entry.hits = [];
}); });
var count = 0 var count = 0
@@ -144,7 +145,8 @@ Blacklist.apply_post = function(post) {
var post_count = 0; var post_count = 0;
Blacklist.entries.forEach(function(entry) { Blacklist.entries.forEach(function(entry) {
if (Blacklist.post_match(post, entry)) { if (Blacklist.post_match(post, entry)) {
entry.hits += 1; let post_id = $(post).data('id');
entry.hits.push(post_id);
post_count += 1; post_count += 1;
} }
}); });