Commiting

app/services/suspend_account_service.rb

@@ -2,14 +2,11 @@
 
 class SuspendAccountService < BaseService
   ASSOCIATIONS_ON_SUSPEND = %w(
-    account_pins
     active_relationships
     block_relationships
     blocked_by_relationships
-    conversation_mutes
     conversations
     custom_filters
-    domain_blocks
     favourites
     follow_requests
     list_accounts
@@ -23,7 +20,6 @@ class SuspendAccountService < BaseService
     scheduled_statuses
     status_bookmarks
     status_pins
-    stream_entries
     subscriptions
   ).freeze
 
@@ -42,7 +38,6 @@ class SuspendAccountService < BaseService
     @account = account
     @options = options
 
-    reject_follows!
     purge_user!
     purge_profile!
     purge_content!
@@ -50,14 +45,6 @@ class SuspendAccountService < BaseService
 
   private
 
-  def reject_follows!
-    return if @account.local? || !@account.activitypub?
-
-    ActivityPub::DeliveryWorker.push_bulk(Follow.where(account: @account)) do |follow|
-      [build_reject_json(follow), follow.target_account_id, follow.account.inbox_url]
-    end
-  end
-
   def purge_user!
     return if !@account.local? || @account.user.nil?
 
@@ -106,34 +93,6 @@ class SuspendAccountService < BaseService
     association.in_batches.destroy_all
   end
 
-  def delete_actor_json
-    return @delete_actor_json if defined?(@delete_actor_json)
-
-    payload = ActiveModelSerializers::SerializableResource.new(
-      @account,
-      serializer: ActivityPub::DeleteActorSerializer,
-      adapter: ActivityPub::Adapter
-    ).as_json
-
-    @delete_actor_json = Oj.dump(ActivityPub::LinkedDataSignature.new(payload).sign!(@account))
-  end
-
-  def build_reject_json(follow)
-    ActiveModelSerializers::SerializableResource.new(
-      follow,
-      serializer: ActivityPub::RejectFollowSerializer,
-      adapter: ActivityPub::Adapter
-    ).to_json
-  end
-
-  def delivery_inboxes
-    @delivery_inboxes ||= @account.followers.inboxes + Relay.enabled.pluck(:inbox_url)
-  end
-
-  def low_priority_delivery_inboxes
-    Account.inboxes - delivery_inboxes
-  end
-
   def associations_for_destruction
     if @options[:destroy]
       ASSOCIATIONS_ON_SUSPEND + ASSOCIATIONS_ON_DESTROY