mirror of https://github.com/mastodon/mastodon
Refactor web push subscription deletion
This commit is contained in:
parent
61b7a04528
commit
0a7de5d1ee
|
@ -15,7 +15,7 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
|
||||||
|
|
||||||
def create
|
def create
|
||||||
with_redis_lock("push_subscription:#{current_user.id}") do
|
with_redis_lock("push_subscription:#{current_user.id}") do
|
||||||
Web::PushSubscription.where(access_token_id: doorkeeper_token.id).destroy_all
|
destroy_web_push_subscriptions!
|
||||||
|
|
||||||
@push_subscription = Web::PushSubscription.create!(
|
@push_subscription = Web::PushSubscription.create!(
|
||||||
endpoint: subscription_params[:endpoint],
|
endpoint: subscription_params[:endpoint],
|
||||||
|
@ -36,12 +36,16 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def destroy
|
def destroy
|
||||||
Web::PushSubscription.where(access_token_id: doorkeeper_token.id).destroy_all
|
destroy_web_push_subscriptions!
|
||||||
render_empty
|
render_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def destroy_web_push_subscriptions!
|
||||||
|
Web::PushSubscription.where(access_token_id: doorkeeper_token.id).destroy_all
|
||||||
|
end
|
||||||
|
|
||||||
def set_push_subscription
|
def set_push_subscription
|
||||||
@push_subscription = Web::PushSubscription.find_by(access_token_id: doorkeeper_token.id)
|
@push_subscription = Web::PushSubscription.find_by(access_token_id: doorkeeper_token.id)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue