pleroma

commit: 59844d020212b1df85101a142b2102d62bdccaef
parent df0880d8d12e557ca79161bc9a942bc8b3655d4e
Author: Mark Felder <feld@feld.me>
Date:   Sat, 28 Jun 2025 13:37:06 -0700

Rename Instance.delete_users_and_activities/1 to Instance.delete/1

Diffstat:
M
lib/pleroma/instances.ex
2
+-
M
lib/pleroma/instances/instance.ex
2
+-
M
lib/pleroma/web/admin_api/controllers/instance_controller.ex
2
+-
M
test/pleroma/instances/instance_test.exs
4
++--
M
test/pleroma/workers/delete_worker_test.exs
2
+-

5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/instances.ex b/lib/pleroma/instances.ex
@@ -38,7 +38,7 @@ defmodule Pleroma.Instances do
   def delete_all_unreachable do
     get_unreachable()
     |> Enum.each(fn {domain, _} ->
-      Instance.delete_users_and_activities(domain)
+      Instance.delete(domain)
     end)
   end
 end
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex
@@ -296,7 +296,7 @@ defmodule Pleroma.Instances.Instance do
   Deletes all users from an instance in a background task, thus also deleting
   all of those users' activities and notifications.
   """
-  def delete_users_and_activities(host) when is_binary(host) do
+  def delete(host) when is_binary(host) do
     DeleteWorker.new(%{"op" => "delete_instance", "host" => host})
     |> Oban.insert()
   end
diff --git a/lib/pleroma/web/admin_api/controllers/instance_controller.ex b/lib/pleroma/web/admin_api/controllers/instance_controller.ex
@@ -49,7 +49,7 @@ defmodule Pleroma.Web.AdminAPI.InstanceController do
   end
 
   def delete(conn, %{"instance" => instance}) do
-    with {:ok, _job} <- Instance.delete_users_and_activities(instance) do
+    with {:ok, _job} <- Instance.delete(instance) do
       json(conn, instance)
     end
   end
diff --git a/test/pleroma/instances/instance_test.exs b/test/pleroma/instances/instance_test.exs
@@ -239,10 +239,10 @@ defmodule Pleroma.Instances.InstanceTest do
     end
   end
 
-  test "delete_users_and_activities/1 schedules a job to delete the instance and users" do
+  test "delete/1 schedules a job to delete the instance and users" do
     insert(:user, nickname: "mario@mushroom.kingdom", name: "Mario")
 
-    {:ok, _job} = Instance.delete_users_and_activities("mushroom.kingdom")
+    {:ok, _job} = Instance.delete("mushroom.kingdom")
 
     assert_enqueued(
       worker: Pleroma.Workers.DeleteWorker,
diff --git a/test/pleroma/workers/delete_worker_test.exs b/test/pleroma/workers/delete_worker_test.exs
@@ -17,7 +17,7 @@ defmodule Pleroma.Workers.DeleteWorkerTest 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")
+      {:ok, job} = Instance.delete("example.com")
 
       assert_enqueued(
         worker: DeleteWorker,