diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-20 21:10:14 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-20 22:53:42 -0500 |
| commit | e3cb18ba7520997a0f605c7f90db258ccccd5e33 (patch) | |
| tree | 77ad166f04c96b2bf97bf989eabc8ca1fa61948c /app/services/notify_service.rb | |
| parent | 8ede83b2179488e0a28101033e8ce9e6978ea849 (diff) | |
| parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/services/notify_service.rb')
| -rw-r--r-- | app/services/notify_service.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 65f6052bf..755fad768 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? |