pleroma

commit: 56aab905e898429b7e2744c3ed2afc96f2a9e97c
parent 9be542e272690d1a0a0923b53f22bf14b3e47b92
Author: Mark Felder <feld@feld.me>
Date:   Fri, 27 Jun 2025 10:56:04 -0700

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

Diffstat:
A
changelog.d/delete-instance.change
1
+
M
lib/pleroma/instances/instance.ex
13
-------------
M
lib/pleroma/workers/delete_worker.ex
11
+++++++++--
A
test/pleroma/workers/delete_worker_test.exs
39
+++++++++++++++++++++++++++++++++++++++

4 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/changelog.d/delete-instance.change b/changelog.d/delete-instance.change
@@ -0,0 +1 @@
+Deleting an instance queues individual jobs for each user that needs to be deleted from the server.
diff --git a/lib/pleroma/instances/instance.ex b/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
diff --git a/lib/pleroma/workers/delete_worker.ex b/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
diff --git a/test/pleroma/workers/delete_worker_test.exs b/test/pleroma/workers/delete_worker_test.exs
@@ -0,0 +1,39 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Workers.DeleteWorkerTest do
+  use Pleroma.DataCase, async: true
+  use Oban.Testing, repo: Pleroma.Repo
+
+  import Pleroma.Factory
+
+  alias Pleroma.Instances.Instance
+  alias Pleroma.Tests.ObanHelpers
+  alias Pleroma.Workers.DeleteWorker
+
+  describe "instance deletion" do
+    test "creates individual Oban jobs for each user when deleting an instance" do
+      user1 = insert(:user, nickname: "alice@example.com", name: "Alice")
+      user2 = insert(:user, nickname: "bob@example.com", name: "Bob")
+
+      {:ok, job} = Instance.delete_users_and_activities("example.com")
+
+      assert_enqueued(
+        worker: DeleteWorker,
+        args: %{"op" => "delete_instance", "host" => "example.com"}
+      )
+
+      {:ok, :ok} = ObanHelpers.perform(job)
+
+      delete_user_jobs = all_enqueued(worker: DeleteWorker, args: %{"op" => "delete_user"})
+
+      assert length(delete_user_jobs) == 2
+
+      user_ids = [user1.id, user2.id]
+      job_user_ids = Enum.map(delete_user_jobs, fn job -> job.args["user_id"] end)
+
+      assert Enum.sort(user_ids) == Enum.sort(job_user_ids)
+    end
+  end
+end