about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-20 20:13:22 +0100
committerGitHub <noreply@github.com>2019-03-20 20:13:22 +0100
commitbde9196b70299405ebe9b16500b7a3f65539b2c3 (patch)
tree4bec904a28c70b916d18055f8291f17c2e58e07b /app/services
parentb9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff)
parent8b5b686f087f99d1a2b54e0760add8180d77fa7e (diff)
Merge pull request #964 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
-rw-r--r--app/services/suspend_account_service.rb2
1 files changed, 1 insertions, 1 deletions
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])