From 3906dd67ed84f963238f9bdccef63fe3fd3a05aa Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 8 Apr 2022 19:17:37 +0200 Subject: [PATCH] Fix extremely rare race condition when deleting a toot or account (#17994) --- app/controllers/api/v1/admin/accounts_controller.rb | 3 ++- app/controllers/api/v1/statuses_controller.rb | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/admin/accounts_controller.rb b/app/controllers/api/v1/admin/accounts_controller.rb index dc9d3402fb4..65ed69f7ba4 100644 --- a/app/controllers/api/v1/admin/accounts_controller.rb +++ b/app/controllers/api/v1/admin/accounts_controller.rb @@ -65,8 +65,9 @@ class Api::V1::Admin::AccountsController < Api::BaseController def destroy authorize @account, :destroy? + json = render_to_body json: @account, serializer: REST::Admin::AccountSerializer Admin::AccountDeletionWorker.perform_async(@account.id) - render json: @account, serializer: REST::Admin::AccountSerializer + render json: json end def unsensitive diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 3fe137bfd79..9270117dad5 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -77,10 +77,12 @@ class Api::V1::StatusesController < Api::BaseController authorize @status, :destroy? @status.discard - RemovalWorker.perform_async(@status.id, { 'redraft' => true }) @status.account.statuses_count = @status.account.statuses_count - 1 + json = render_to_body json: @status, serializer: REST::StatusSerializer, source_requested: true - render json: @status, serializer: REST::StatusSerializer, source_requested: true + RemovalWorker.perform_async(@status.id, { 'redraft' => true }) + + render json: json end private