From c699b2d141d7aa910bd81ae5fe881ecec7039395 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 5 Jul 2018 19:32:50 +0200 Subject: [PATCH] Remove duplicate code for handling muted users The mute check was indeed streamlined in f62539ce5c106e27a371702d499ec4df52eccde6 and we somehow kept some of the old code when merging. --- app/lib/feed_manager.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index 6eb2788719..f30b00aa2e 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -155,12 +155,6 @@ class FeedManager return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?) return true if keyword_filter_from_home?(status, receiver_id) - check_for_mutes = [status.account_id] - check_for_mutes.concat(status.mentions.pluck(:account_id)) - check_for_mutes.concat([status.reblog.account_id]) if status.reblog? - - return true if Mute.where(account_id: receiver_id, target_account_id: check_for_mutes).any? - check_for_blocks = status.mentions.pluck(:account_id) check_for_blocks.concat([status.account_id]) check_for_blocks.concat([status.reblog.account_id]) if status.reblog?