tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(push-subscriptions): Refactor how Sidekiq jobs are handled (#4226)

Browse Source
This commit is contained in:
Sorin Davidoi
2017-07-18 16:25:40 +02:00
committed by Eugen Rochko
parent afa52e4d63
commit 8387b3928e
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/workers/web_push_notification_worker.rb
View File

@ -5,22 +5,18 @@ class WebPushNotificationWorker
sidekiq_options backtrace: true
def perform(recipient_id, notification_id)
recipient = Account.find(recipient_id)
def perform(session_activation_id, notification_id)
session_activation = SessionActivation.find(session_activation_id)
notification = Notification.find(notification_id)
sessions_with_subscriptions = recipient.user.session_activations.where.not(web_push_subscription: 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)
sessions_with_subscriptions.each do |session|
begin
session.web_push_subscription.push(notification)
rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
# Subscription expiration is not currently implemented in any browser
session.web_push_subscription.destroy!
session.update!(web_push_subscription: nil)
rescue Webpush::PayloadTooLarge => e
Rails.logger.error(e)
end
raise e
end
end
end