mastofe

commit: 00e9dac1d356e0e3fba757f53c5e5a5a565b904b
parent: f763e844e8e703891ada1bc44047e4e043007c68
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sun,  4 Dec 2016 16:51:49 +0100

Automatically block outgoing notifications from silenced accounts to users
who don't follow them

Diffstat:
M
app/lib/feed_manager.rb
9
+++++----
M
app/services/notify_service.rb
1
+

2 files changed, 6 insertions(+), 4 deletions(-)
diff --git 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
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -36,6 +36,7 @@ class NotifyService < BaseService
     blocked   = false
     blocked ||= @recipient.id == @notification.from_account.id
     blocked ||= @recipient.blocking?(@notification.from_account)
+    blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))
     blocked ||= (@recipient.user.settings(:interactions).must_be_follower  && !@notification.from_account.following?(@recipient))
     blocked ||= (@recipient.user.settings(:interactions).must_be_following && !@recipient.following?(@notification.from_account))
     blocked ||= send("blocked_#{@notification.type}?")