about summary refs log tree commit diff
path: root/app/services/notify_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-09-08 03:41:16 +0200
committerGitHub <noreply@github.com>2020-09-08 03:41:16 +0200
commit65760f59df46e388919a9f7ccba1958d967b2695 (patch)
tree50243d7994f006d3bb53ba829460cbc191dbe540 /app/services/notify_service.rb
parent169f9105ef9b65380ff6af177c11a7b247025684 (diff)
Refactor feed manager (#14761)
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r--app/services/notify_service.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index abd676494..e4ca10eb1 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -13,15 +13,13 @@ class NotifyService < BaseService
     push_to_conversation! if direct_message?
     send_email! if email_enabled?
   rescue ActiveRecord::RecordInvalid
-    # rubocop:disable Style/RedundantReturn
-    return
-    # rubocop:enable Style/RedundantReturn
+    nil
   end
 
   private
 
   def blocked_mention?
-    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient.id)
+    FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
   end
 
   def blocked_favourite?