about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-04 16:51:49 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-04 16:51:49 +0100
commit00e9dac1d356e0e3fba757f53c5e5a5a565b904b (patch)
tree6220e07e16985b7d86eb58b89b60ed13198bea2a /app/services
parentf763e844e8e703891ada1bc44047e4e043007c68 (diff)
Automatically block outgoing notifications from silenced accounts to users
who don't follow them
Diffstat (limited to 'app/services')
-rw-r--r--app/services/notify_service.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 1efd326b0..ab76e2a6b 100644
--- 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}?")