Change account suspensions to be reversible by default (#14726)

This commit is contained in:
Eugen Rochko 2020-09-15 14:37:58 +02:00 committed by GitHub
parent bbcbf12215
commit ed099d8bdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 526 additions and 279 deletions

View file

@ -87,7 +87,7 @@ module Mastodon
say('Use --force to reattach it anyway and delete the other user')
return
elsif account.user.present?
account.user.destroy!
DeleteAccountService.new.call(account, reserve_email: false)
end
end
@ -192,7 +192,7 @@ module Mastodon
end
say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
SuspendAccountService.new.call(account, reserve_email: false)
DeleteAccountService.new.call(account, reserve_email: false)
say('OK', :green)
end