From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 13 Nov 2016 20:11:45 +0000 (+0100)
Subject: Fix #63 - Filter mentions that reply to blocked users
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f8f15e5697c1f6e31cd2ee8e1ac5f654454c7dfe;p=mastodon.git

Fix #63 - Filter mentions that reply to blocked users
---

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