treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Do not distribute Delete when rejecting unapproved accounts (#10321)

lolsob-rspec
ThibG 2019-03-19 16:33:30 +01:00 committed by Eugen Rochko
parent 01cdd74013
commit e9fc1e8ccb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/accounts_controller.rb
View File

@ -53,7 +53,7 @@ module Admin
def reject def reject
authorize @account.user, :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') redirect_to admin_accounts_path(pending: '1')
end end

2
app/services/suspend_account_service.rb
View File

@ -68,7 +68,7 @@ class SuspendAccountService < BaseService
end end
def purge_content! 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| @account.statuses.reorder(nil).find_in_batches do |statuses|
BatchedRemoveStatusService.new.call(statuses, skip_side_effects: @options[:destroy]) BatchedRemoveStatusService.new.call(statuses, skip_side_effects: @options[:destroy])