From fbe45128ed5e490caacb89103fe5648dd2dd38c9 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Tue, 27 Jun 2017 16:19:41 -0700 Subject: [PATCH] When multiple filters hide a post, non-stub filters should override with-stub filters. #1414 --- src/Filtering/Filter.coffee | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Filtering/Filter.coffee b/src/Filtering/Filter.coffee index 5a7eb4b33..548ba1b46 100644 --- a/src/Filtering/Filter.coffee +++ b/src/Filtering/Filter.coffee @@ -113,19 +113,25 @@ Filter = test: (post, hideable=true) -> return post.filterResults if post.filterResults - hl = undefined - top = false + hide = false + stub = true + hl = undefined + top = false for key of Filter.filters when ((value = Filter[key] post)?) # Continue if there's nothing to filter (no tripcode for example). for filter in Filter.filters[key] when (result = filter value, post.boardID, post.isReply) - {hide, stub} = result - if hide - return {hide, stub} if hideable + if result.hide + if hideable + hide = true + stub and= result.stub else unless hl and result.class in hl (hl or= []).push result.class top or= result.top - {hl, top} + if hide + {hide, stub} + else + {hl, top} node: -> return if @isClone