about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-21 10:37:34 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-21 10:37:34 +0100
commit93577f74e7ec2edee3a1a208513ae7290211e682 (patch)
treec3c6cd9518ffc4824ea9ae63383e5d2f5a3107e6 /app
parentfb48cc3b7400f73c01d59a038eaf7fc3020c39f4 (diff)
Use old rules for mention notifications as for mentions timeline
Diffstat (limited to 'app')
-rw-r--r--app/services/notify_service.rb19
1 files changed, 18 insertions, 1 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index a51c5b959..c0f1d4c53 100644
--- 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