Fix guard clause in WebPushNotificationWorker (#4421)

master
Eugen Rochko 8 years ago committed by GitHub
parent 6e186b9c77
commit 4e2f2fab73
  1. 11
      app/workers/web_push_notification_worker.rb

@ -9,16 +9,17 @@ class WebPushNotificationWorker
session_activation = SessionActivation.find(session_activation_id) session_activation = SessionActivation.find(session_activation_id)
notification = Notification.find(notification_id) notification = Notification.find(notification_id)
return if session_activation.nil? || notification.nil? return if session_activation.web_push_subscription.nil? || notification.activity.nil?
begin
session_activation.web_push_subscription.push(notification) session_activation.web_push_subscription.push(notification)
rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
# Subscription expiration is not currently implemented in any browser # Subscription expiration is not currently implemented in any browser
session_activation.web_push_subscription.destroy! session_activation.web_push_subscription.destroy!
session_activation.update!(web_push_subscription: nil) session_activation.update!(web_push_subscription: nil)
raise e true
end rescue ActiveRecord::RecordNotFound
true
end end
end end

Loading…
Cancel
Save