github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-10 15:50:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Use newly created PushSubscription object for push test message (#13293)

Browse Source
This commit is contained in:
Rafael dos Santos Silva 2021-06-04 16:05:46 -03:00 committed by GitHub
parent 46cd355046
commit ee6ff9f1d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/push_notification_pusher.rb
View File

@ -35,12 +35,12 @@ class PushNotificationPusher
user.push_subscriptions.clear user.push_subscriptions.clear
end end
def self.subscribe(user, subscription, send_confirmation) def self.subscribe(user, push_params, send_confirmation)
data = subscription.to_json data = push_params.to_json
subscriptions = PushSubscription.where(user: user, data: data) subscriptions = PushSubscription.where(user: user, data: data)
subscriptions_count = subscriptions.count subscriptions_count = subscriptions.count
if subscriptions_count > 1 new_subscription = if subscriptions_count > 1
subscriptions.destroy_all subscriptions.destroy_all
PushSubscription.create!(user: user, data: data) PushSubscription.create!(user: user, data: data)
elsif subscriptions_count == 0 elsif subscriptions_count == 0
@ -57,7 +57,7 @@ class PushNotificationPusher
tag: "#{Discourse.current_hostname}-subscription" tag: "#{Discourse.current_hostname}-subscription"
} }
send_notification(user, subscription, message) send_notification(user, new_subscription, message)
end end
end end