From c54ea07628fbf6a4e9360585cf775f70f871e3e9 Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Fri, 18 Sep 2020 11:55:52 -0500 Subject: [Bug] Properly discard originals when redrafting in manual publishing mode --- app/controllers/api/v1/statuses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/api/v1/statuses_controller.rb') diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index ca40fac0a..a7ebbd014 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -100,7 +100,7 @@ class Api::V1::StatusesController < Api::BaseController @status = Status.where(account_id: current_user.account).find(params[:id]) authorize @status, :destroy? - if !(current_user.setting_unpublish_on_delete && @status.published?) || truthy_param?(:redraft) + if !current_user.setting_unpublish_on_delete || !@status.published? || truthy_param?(:redraft) @status.discard RemovalWorker.perform_async(@status.id, redraft: true) @status.account.statuses_count = @status.account.statuses_count - 1 -- cgit