From e76a34ee42763fbf0d0252e54002ebe5fcb4b92c Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Wed, 12 Aug 2020 22:33:12 -0500 Subject: [Moderation] Limit scope of admin-level silences to timelines, search, and accounts not following or followed by the user --- app/lib/status_filter.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/lib') diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb index 725031a7f..7555243c0 100644 --- a/app/lib/status_filter.rb +++ b/app/lib/status_filter.rb @@ -3,15 +3,16 @@ class StatusFilter attr_reader :status, :account - def initialize(status, account, preloaded_relations = {}) + def initialize(status, account, filter_silenced, preloaded_relations = {}) @status = status @account = account @preloaded_relations = preloaded_relations + @filter_silenced = filter_silenced end def filtered? return false if !account.nil? && account.id == status.account_id - blocked_by_policy? || (account_present? && filtered_status?) || silenced_account? + blocked_by_policy? || (account_present? && filtered_status?) || (@filter_silenced && silenced_account?) end private -- cgit