From ee6ff9f1d7c863db3d49b185dd6a37154e29deef Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Fri, 4 Jun 2021 16:05:46 -0300 Subject: [PATCH] FIX: Use newly created PushSubscription object for push test message (#13293) --- app/services/push_notification_pusher.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/push_notification_pusher.rb b/app/services/push_notification_pusher.rb index 72000de01e6..3e56da4431c 100644 --- a/app/services/push_notification_pusher.rb +++ b/app/services/push_notification_pusher.rb @@ -35,12 +35,12 @@ class PushNotificationPusher user.push_subscriptions.clear end - def self.subscribe(user, subscription, send_confirmation) - data = subscription.to_json + def self.subscribe(user, push_params, send_confirmation) + data = push_params.to_json subscriptions = PushSubscription.where(user: user, data: data) subscriptions_count = subscriptions.count - if subscriptions_count > 1 + new_subscription = if subscriptions_count > 1 subscriptions.destroy_all PushSubscription.create!(user: user, data: data) elsif subscriptions_count == 0 @@ -57,7 +57,7 @@ class PushNotificationPusher tag: "#{Discourse.current_hostname}-subscription" } - send_notification(user, subscription, message) + send_notification(user, new_subscription, message) end end