mastofe

commit: 4e2f2fab73d6632a2c5f8ff3d5ba26140747cd60
parent: 6e186b9c77e7f23da6b46b901aace1c0b3b163ad
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 28 Jul 2017 17:21:28 +0200

Fix guard clause in WebPushNotificationWorker (#4421)


Diffstat:
M
app/workers/web_push_notification_worker.rb
21
+++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
@@ -7,18 +7,19 @@ class WebPushNotificationWorker
 
   def perform(session_activation_id, notification_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)
-    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)
+    session_activation.web_push_subscription.push(notification)
+  rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
+    # Subscription expiration is not currently implemented in any browser
 
-      raise e
-    end
+    session_activation.web_push_subscription.destroy!
+    session_activation.update!(web_push_subscription: nil)
+
+    true
+  rescue ActiveRecord::RecordNotFound
+    true
   end
 end