Fix #63 - Filter mentions that reply to blocked users

1 files changed, 7 insertions, 2 deletions

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index fe88c0fb9..8cf465da8 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -78,8 +78,13 @@ class FeedManager
   end
 
   def filter_from_mentions?(status, receiver)
-    should_filter = receiver.id == status.account_id                    # Filter if I'm mentioning myself
-    should_filter = should_filter || receiver.blocking?(status.account) # or it's from someone I blocked
+    should_filter = receiver.id == status.account_id                             # Filter if I'm mentioning myself
+    should_filter = should_filter || receiver.blocking?(status.account)          # or it's from someone I blocked
+
+    if status.reply? && !status.thread.account.nil?                              # or it's a reply
+      should_filter = should_filter || receiver.blocking?(status.thread.account) # to a user I blocked
+    end
+
     should_filter
   end