diff options
author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/services/notify_service.rb | |
parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (diff) |
Merge branch 'master' into master
Diffstat (limited to 'app/services/notify_service.rb')
-rw-r--r-- | app/services/notify_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb index 942cd9d21..62508a049 100644 --- a/app/services/notify_service.rb +++ b/app/services/notify_service.rb @@ -17,7 +17,7 @@ class NotifyService < BaseService private def blocked_mention? - FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient) + FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient.id) end def blocked_favourite? @@ -50,7 +50,7 @@ class NotifyService < BaseService def create_notification @notification.save! return unless @notification.browserable? - FeedManager.instance.broadcast(@recipient.id, event: 'notification', payload: FeedManager.instance.inline_render(@recipient, 'api/v1/notifications/show', @notification)) + Redis.current.publish(@recipient.id, Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, 'api/v1/notifications/show'))) end def send_email |