From 93577f74e7ec2edee3a1a208513ae7290211e682 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 21 Nov 2016 10:37:34 +0100
Subject: Use old rules for mention notifications as for mentions timeline

---
 app/services/notify_service.rb | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'app/services')

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
 
-- 
cgit