From 3681f7dcce8f82d2a4377a051952159cd03919c0 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 11 Sep 2019 16:32:44 +0200 Subject: port tootsuite#11805 to monserfork: Change deletes to preserve soft-deleted statuses in unresolved reports Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable --- app/lib/activitypub/activity/delete.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/lib/activitypub/activity/delete.rb') diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb index 8b9c21958..a4732f1b8 100644 --- a/app/lib/activitypub/activity/delete.rb +++ b/app/lib/activitypub/activity/delete.rb @@ -13,8 +13,7 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity def delete_person lock_or_return("delete_in_progress:#{@account.id}") do - SuspendAccountService.new.call(@account) - @account.destroy! + SuspendAccountService.new.call(@account, reserve_username: false) end end -- cgit