Do not distribute Delete when rejecting unapproved accounts (mastodon…

…#10321)
Origin-Creative · Mar 19, 2019 · 31d2019 · 31d2019
1 parent 85f8145
commit 31d2019
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
@@ -53,7 +53,7 @@ def approve
 
     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
@@ -68,7 +68,7 @@ def purge_user!
   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])