mastofe

commit: 93577f74e7ec2edee3a1a208513ae7290211e682
parent: fb48cc3b7400f73c01d59a038eaf7fc3020c39f4
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 21 Nov 2016 10:37:34 +0100

Use old rules for mention notifications as for mentions timeline

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

1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
@@ -14,10 +14,27 @@ class NotifyService < BaseService
 
   private
 
+  def blocked_mention?
+    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
+  end
+
+  def blocked_favourite?
+    false
+  end
+
+  def blocked_follow?
+    false
+  end
+
+  def blocked_reblog?
+    false
+  end
+
   def blocked?
-    blocked = false
+    blocked   = false
     blocked ||= @recipient.id == @notification.from_account.id
     blocked ||= @recipient.blocking?(@notification.from_account)
+    blocked ||= send("blocked_#{@notification.type}?")
     blocked
   end