diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-18 18:58:47 +0200 |
commit | d69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch) | |
tree | ef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/workers/web_push_notification_worker.rb | |
parent | c727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff) | |
parent | 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff) |
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/workers/web_push_notification_worker.rb')
-rw-r--r-- | app/workers/web_push_notification_worker.rb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb index e8f1d72bd..da4043ddb 100644 --- a/app/workers/web_push_notification_worker.rb +++ b/app/workers/web_push_notification_worker.rb @@ -5,22 +5,18 @@ class WebPushNotificationWorker sidekiq_options backtrace: true - def perform(recipient_id, notification_id) - recipient = Account.find(recipient_id) + def perform(session_activation_id, notification_id) + session_activation = SessionActivation.find(session_activation_id) notification = Notification.find(notification_id) - sessions_with_subscriptions = recipient.user.session_activations.where.not(web_push_subscription: nil) + begin + session_activation.web_push_subscription.push(notification) + rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e + # Subscription expiration is not currently implemented in any browser + session_activation.web_push_subscription.destroy! + session_activation.update!(web_push_subscription: nil) - sessions_with_subscriptions.each do |session| - begin - session.web_push_subscription.push(notification) - rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription - # Subscription expiration is not currently implemented in any browser - session.web_push_subscription.destroy! - session.update!(web_push_subscription: nil) - rescue Webpush::PayloadTooLarge => e - Rails.logger.error(e) - end + raise e end end end |