Improve suspend account service

diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 4e03661da6ee4dd59ff9ea77c10688698365d8c0..fa55e668e928093af2b81bcc69df03777b132e56 100644 (file)
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -11,10 +11,10 @@ class RemoveStatusService < BaseService
 
     status.destroy!
 
-    if status.account.local?
-      HubPingWorker.perform_async(status.account.id)
-      Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
-    end
+    return unless status.account.local?
+
+    HubPingWorker.perform_async(status.account.id)
+    Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
   end
 
   private

diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 729bf42fee950446af8f049326b9f88654984414..04a0866135aeb662f176c1c2377588c8cce84612 100644 (file)
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -12,8 +12,11 @@ class SuspendAccountService < BaseService
   private
 
   def purge_content
+    @account.statuses.find_each do |status|
+      RemoveStatusService.new.call(status)
+    end
+
     @account.media_attachments.destroy_all
-    @account.statuses.destroy_all
     @account.stream_entries.destroy_all
     @account.mentions.destroy_all
     @account.notifications.destroy_all