mastofe

commit: a929f7e6ac92cf5dbb8458eb2975fa834e751e92
parent: cf51e07bde14bb21161f8bbe592207c2ef88ad16
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sat, 22 Jul 2017 16:36:36 +0200

Fix #4172 - Mutes now block notifications (#4300)


Diffstat:
M
app/services/notify_service.rb
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -21,7 +21,7 @@ class NotifyService < BaseService
   end
 
   def blocked_favourite?
-    @recipient.muting?(@notification.from_account)
+    false
   end
 
   def blocked_follow?
@@ -41,6 +41,7 @@ class NotifyService < BaseService
     blocked ||= @recipient.id == @notification.from_account.id                                                                       # Skip for interactions with self
     blocked ||= @recipient.domain_blocking?(@notification.from_account.domain) && !@recipient.following?(@notification.from_account) # Skip for domain blocked accounts
     blocked ||= @recipient.blocking?(@notification.from_account)                                                                     # Skip for blocked accounts
+    blocked ||= @recipient.muting?(@notification.from_account)                                                                       # Skip for muted accounts
     blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))                         # Hellban
     blocked ||= (@recipient.user.settings.interactions['must_be_follower']  && !@notification.from_account.following?(@recipient))   # Options
     blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account))   # Options