aboutsummaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-05-11 11:49:12 +0200
committerGitHub <noreply@github.com>2018-05-11 11:49:12 +0200
commitb4fb766b23f4b50b51a366f55b451770ece3153a (patch)
treef3089da3ee1d3d937525a227136a739a451caad9 /app/workers
parent9a794067f77d936783736574640b1238bb8e6b18 (diff)
downloadmastodon-b4fb766b23f4b50b51a366f55b451770ece3153a.tar
mastodon-b4fb766b23f4b50b51a366f55b451770ece3153a.tar.gz
mastodon-b4fb766b23f4b50b51a366f55b451770ece3153a.tar.bz2
mastodon-b4fb766b23f4b50b51a366f55b451770ece3153a.zip
Add REST API for Web Push Notifications subscriptions (#7445)
- POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/web/push_notification_worker.rb18
-rw-r--r--app/workers/web_push_notification_worker.rb25
2 files changed, 18 insertions, 25 deletions
diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
new file mode 100644
index 000000000..4a40e5c8b
--- /dev/null
+++ b/app/workers/web/push_notification_worker.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Web::PushNotificationWorker
+ include Sidekiq::Worker
+
+ sidekiq_options backtrace: true
+
+ def perform(subscription_id, notification_id)
+ subscription = ::Web::PushSubscription.find(subscription_id)
+ notification = Notification.find(notification_id)
+
+ subscription.push(notification) unless notification.activity.nil?
+ rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
+ subscription.destroy!
+ rescue ActiveRecord::RecordNotFound
+ true
+ end
+end
diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
deleted file mode 100644
index eacea04c3..000000000
--- a/app/workers/web_push_notification_worker.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-class WebPushNotificationWorker
- include Sidekiq::Worker
-
- sidekiq_options backtrace: true
-
- def perform(session_activation_id, notification_id)
- session_activation = SessionActivation.find(session_activation_id)
- notification = Notification.find(notification_id)
-
- return if session_activation.web_push_subscription.nil? || notification.activity.nil?
-
- session_activation.web_push_subscription.push(notification)
- rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
- # Subscription expiration is not currently implemented in any browser
-
- session_activation.web_push_subscription.destroy!
- session_activation.update!(web_push_subscription: nil)
-
- true
- rescue ActiveRecord::RecordNotFound
- true
- end
-end