1 files changed, 10 insertions, 7 deletions
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index 4cb5804da..dbfa24dfe 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -15,9 +15,9 @@ class StatusFilter
   def filtered?
     return true if status.nil? || account.nil?
     return false if !account.nil? && account.id == status.account_id
-    return !account.user.invert_filters if !account.user.filter_timelines_only && redis.sismember("filtered_statuses:#{account.id}", status.id)
+    return true if redis.sismember("filtered_statuses:#{account.id}", status.id)
     if blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
-      redis.sadd("filtered_statuses:#{account.id}", status.id) unless account.user.filter_timelines_only
+      redis.sadd("filtered_statuses:#{account.id}", status.id)
       return true
     end
     false
@@ -40,7 +40,13 @@ class StatusFilter
     return true if account.user_hides_replies_of_blocker? && reply_to_blocker?
 
     # filtered by user?
-    return true if !account.user.filter_timelines_only && !account.user.invert_filters && phrase_filtered?(status, account.id)
+    if account.user.filters_enabled && !account.user.filter_timelines_only
+      if account.user.invert_filters
+        return true unless phrase_filtered?(status, account.id)
+      else
+        return true if phrase_filtered?(status, account.id)
+      end
+    end
 
     # kajiht has no filters if status has no mentions
     return false if status&.mentions.blank?
@@ -74,10 +80,7 @@ class StatusFilter
     return true if !@preloaded_relations[:muting] && account.user_hides_mentions_of_muted? && account.muting?(mentioned_account_ids)
     return true if !@preloaded_relations[:blocking] && account.user_hides_mentions_of_blocked? && account.blocking?(mentioned_account_ids)
     return false unless status.reply? && status.private_visibility? && account.user_hides_mentions_outside_scope?
-    return true if !@preloaded_relations[:following] && (mentioned_account_ids - account.following_ids).any?
-
-    # filtered by user?
-    !account.user.filter_timelines_only && account.user.invert_filters && !phrase_filtered?(status, account.id)
+    !@preloaded_relations[:following] && (mentioned_account_ids - account.following_ids).any?
   end
 
   def reply_to_blocked?