Automatically block outgoing notifications from silenced accounts to users

who don't follow them

1 files changed, 5 insertions, 4 deletions

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index b812ad1f4..e08f9a0da 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -82,12 +82,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 ||= 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 ||= receiver.blocking?(status.account)                                    # or it's from someone I blocked
     should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) # or if it mentions someone I blocked
+    should_filter ||= (status.account.silenced? && !receiver.following?(status.account))    # of if the account is silenced and I'm not following them
 
-    if status.reply? && !status.thread.account.nil?                         # or it's a reply
-      should_filter ||= receiver.blocking?(status.thread.account)           # to a user I blocked
+    if status.reply? && !status.thread.account.nil?                                         # or it's a reply
+      should_filter ||= receiver.blocking?(status.thread.account)                           # to a user I blocked
     end
 
     should_filter