Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)
Change all account actions except "none" to resolve all unresolved reports Refactor `SuspendAccountService` to be more readable
This commit is contained in:
parent
4fe127664b
commit
c5d37f18cb
21 changed files with 98 additions and 45 deletions
|
@ -185,7 +185,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
say("Deleting user with #{account.statuses_count} statuses, this might take a while...")
|
||||
SuspendAccountService.new.call(account, including_user: true)
|
||||
SuspendAccountService.new.call(account, reserve_email: false)
|
||||
say('OK', :green)
|
||||
end
|
||||
|
||||
|
@ -239,7 +239,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
if [404, 410].include?(code)
|
||||
SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
|
||||
SuspendAccountService.new.call(account, reserve_username: false) unless options[:dry_run]
|
||||
1
|
||||
else
|
||||
# Touch account even during dry run to avoid getting the account into the window again
|
||||
|
|
|
@ -42,7 +42,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
processed, = parallelize_with_progress(scope) do |account|
|
||||
SuspendAccountService.new.call(account, destroy: true) unless options[:dry_run]
|
||||
SuspendAccountService.new.call(account, reserve_username: false, skip_side_effects: true) unless options[:dry_run]
|
||||
end
|
||||
|
||||
DomainBlock.where(domain: domain).destroy_all unless options[:dry_run]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue