Merge branch 'delete-instance-improvement' into 'develop'

Queue individual jobs for each user that needs to be deleted when deleting an instance.

See merge request pleroma/pleroma!4377

lib/pleroma/instances/instance.ex

@@ -9,7 +9,6 @@ defmodule Pleroma.Instances.Instance do
   alias Pleroma.Instances.Instance
   alias Pleroma.Maps
   alias Pleroma.Repo
-  alias Pleroma.User
   alias Pleroma.Workers.DeleteWorker
 
   use Ecto.Schema
@@ -300,16 +299,4 @@ defmodule Pleroma.Instances.Instance do
     DeleteWorker.new(%{"op" => "delete_instance", "host" => host})
     |> Oban.insert()
   end
-
-  def perform(:delete_instance, host) when is_binary(host) do
-    User.Query.build(%{nickname: "@#{host}"})
-    |> Repo.chunk_stream(100, :batches)
-    |> Stream.each(fn users ->
-      users
-      |> Enum.each(fn user ->
-        User.perform(:delete, user)
-      end)
-    end)
-    |> Stream.run()
-  end
 end

lib/pleroma/workers/delete_worker.ex

@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Workers.DeleteWorker do
-  alias Pleroma.Instances.Instance
   alias Pleroma.User
 
   use Oban.Worker, queue: :slow
@@ -15,7 +14,15 @@ defmodule Pleroma.Workers.DeleteWorker do
   end
 
   def perform(%Job{args: %{"op" => "delete_instance", "host" => host}}) do
-    Instance.perform(:delete_instance, host)
+    Pleroma.Repo.transaction(fn ->
+      User.Query.build(%{nickname: "@#{host}"})
+      |> Pleroma.Repo.all()
+      |> Enum.each(fn user ->
+        %{"op" => "delete_user", "user_id" => user.id}
+        |> __MODULE__.new()
+        |> Oban.insert()
+      end)
+    end)
   end
 
   @impl true