diff options
author | ThibG <thib@sitedethib.com> | 2019-03-19 16:33:30 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-19 16:33:30 +0100 |
commit | 1217185cfa7fa13e78f979e8723fc82f93a28205 (patch) | |
tree | 5ad5e7e7dcc268240fbe968338bace2382778d4b | |
parent | d041b7a1e77f9e2a9122d8b04d247673c4fda3db (diff) |
Do not distribute Delete when rejecting unapproved accounts (#10321)
-rw-r--r-- | app/controllers/admin/accounts_controller.rb | 2 | ||||
-rw-r--r-- | app/services/suspend_account_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index e160c603a..e7795e95c 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -53,7 +53,7 @@ module Admin def reject authorize @account.user, :reject? - SuspendAccountService.new.call(@account, including_user: true, destroy: true) + SuspendAccountService.new.call(@account, including_user: true, destroy: true, skip_distribution: true) redirect_to admin_accounts_path(pending: '1') end diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 24fa1be69..6c2ecad30 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -68,7 +68,7 @@ class SuspendAccountService < BaseService end def purge_content! - distribute_delete_actor! if @account.local? + distribute_delete_actor! if @account.local? && !@options[:skip_distribution] @account.statuses.reorder(nil).find_in_batches do |statuses| BatchedRemoveStatusService.new.call(statuses, skip_side_effects: @options[:destroy]) |