vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix guard clause in WebPushNotificationWorker (#4421)

Browse source
This commit is contained in:
Eugen Rochko 2017-07-28 17:21:28 +02:00 committed by GitHub
parent 6e186b9c77
commit 4e2f2fab73
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/workers/web_push_notification_worker.rb
View file

@ -7,18 +7,19 @@ class WebPushNotificationWorker
def perform(session_activation_id, notification_id) def perform(session_activation_id, notification_id)
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
rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e # 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.update!(web_push_subscription: nil)
raise e session_activation.web_push_subscription.destroy!
end session_activation.update!(web_push_subscription: nil)
true
rescue ActiveRecord::RecordNotFound
true
end end
end end