diff --git a/js/post-filter.js b/js/post-filter.js index f3f161c6..78fd35ce 100644 --- a/js/post-filter.js +++ b/js/post-filter.js @@ -237,12 +237,8 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata var postUid = $ele.find('.poster_id').text(); } - let postName; - let postTrip = ''; - if (!pageData.forcedAnon) { - postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($ele.find('.name')[0]); - postTrip = $ele.find('.trip').text(); - } + let postName = (typeof $ele.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($ele.find('.name')[0]); + let postTrip = $ele.find('.trip').text(); /* display logic and bind click handlers */ @@ -297,39 +293,34 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata } // name - if (!pageData.forcedAnon && !$ele.data('hiddenByName')) { + if (!$ele.data('hiddenByName')) { $buffer.find('#filter-add-name').click(function () { addFilter('name', postName, false); }); $buffer.find('#filter-remove-name').addClass('hidden'); - } else if (!pageData.forcedAnon) { + } else { $buffer.find('#filter-remove-name').click(function () { removeFilter('name', postName, false); }); - $buffer.find('#filter-add-name').addClass('hidden'); - } else { - // board has forced anon - $buffer.find('#filter-remove-name').addClass('hidden'); $buffer.find('#filter-add-name').addClass('hidden'); } // tripcode - if (!pageData.forcedAnon && !$ele.data('hiddenByTrip') && postTrip !== '') { + if (!$ele.data('hiddenByTrip') && postTrip !== '') { $buffer.find('#filter-add-trip').click(function () { addFilter('trip', postTrip, false); }); $buffer.find('#filter-remove-trip').addClass('hidden'); - } else if (!pageData.forcedAnon && postTrip !== '') { + } else if (postTrip !== '') { $buffer.find('#filter-remove-trip').click(function () { removeFilter('trip', postTrip, false); }); $buffer.find('#filter-add-trip').addClass('hidden'); } else { - // board has forced anon $buffer.find('#filter-remove-trip').addClass('hidden'); $buffer.find('#filter-add-trip').addClass('hidden'); } @@ -391,7 +382,6 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata var localList = pageData.localList; var noReplyList = pageData.noReplyList; var hasUID = pageData.hasUID; - var forcedAnon = pageData.forcedAnon; var hasTrip = ($post.find('.trip').length > 0); var hasSub = ($post.find('.subject').length > 0); @@ -432,9 +422,8 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata } // matches generalFilter - if (!forcedAnon) - name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($post.find('.name')[0]); - if (!forcedAnon && hasTrip) + name = (typeof $post.find('.name').contents()[0] == 'undefined') ? '' : nameSpanToString($post.find('.name')[0]); + if (hasTrip) trip = $post.find('.trip').text(); if (hasSub) subject = $post.find('.subject').text(); @@ -455,13 +444,13 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata pattern = new RegExp(rule.value); switch (rule.type) { case 'name': - if (!forcedAnon && pattern.test(name)) { + if (pattern.test(name)) { $post.data('hiddenByName', true); hide(post); } break; case 'trip': - if (!forcedAnon && hasTrip && pattern.test(trip)) { + if (hasTrip && pattern.test(trip)) { $post.data('hiddenByTrip', true); hide(post); } @@ -488,13 +477,13 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata } else { switch (rule.type) { case 'name': - if (!forcedAnon && rule.value == name) { + if (rule.value == name) { $post.data('hiddenByName', true); hide(post); } break; case 'trip': - if (!forcedAnon && hasTrip && rule.value == trip) { + if (hasTrip && rule.value == trip) { $post.data('hiddenByTrip', true); hide(post); } @@ -827,8 +816,7 @@ if (active_page === 'thread' || active_page === 'index' || active_page === 'cata boardId: board_name, // get the id from the global variable localList: [], // all the blacklisted post IDs or UIDs that apply to the current page noReplyList: [], // any posts that replies to the contents of this list shall be hidden - hasUID: (document.getElementsByClassName('poster_id').length > 0), - forcedAnon: ($('th:contains(Name)').length === 0) // tests by looking for the Name label on the reply form + hasUID: (document.getElementsByClassName('poster_id').length > 0) }; initStyle();