diff options
Diffstat (limited to 'app/lib/feed_manager.rb')
| -rw-r--r-- | app/lib/feed_manager.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 6d8f46e6f..b2f040811 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -157,8 +157,7 @@ class FeedManager def filter_from_home?(status, receiver_id) return false if receiver_id == status.account_id return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) - return true if filtering_thread?(receiver_id, status.conversation_id) - return true if phrase_filtered?(status, receiver_id, :home) + return true if phrase_filtered?(status, receiver_id) check_for_blocks = status.active_mentions.pluck(:account_id) check_for_blocks.concat([status.account_id]) @@ -188,8 +187,7 @@ class FeedManager def filter_from_mentions?(status, receiver_id) return true if receiver_id == status.account_id - return true if filtering_thread?(receiver_id, status.conversation_id) - return true if phrase_filtered?(status, receiver_id, :notifications) + return true if phrase_filtered?(status, receiver_id) # This filter is called from NotifyService, but already after the sender of # the notification has been checked for mute/block. Therefore, it's not |