about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-05 19:32:50 +0200
committerThibG <thib@sitedethib.com>2018-07-07 19:10:13 +0200
commitc699b2d141d7aa910bd81ae5fe881ecec7039395 (patch)
tree4521b57cff1ee7b48224d66d79fb1ffbc878c332
parentc18d55e8c25d47a81f99f5ea018d58eecb206a79 (diff)
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.
-rw-r--r--app/lib/feed_manager.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 6eb278871..f30b00aa2 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?