diff --git a/lib/pleroma/instances.ex b/lib/pleroma/instances.ex index 79fbd538f..52dbba8ad 100644 --- 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 index cf896ca08..3695e0b75 100644 --- 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 index 117a72280..40d4d812e 100644 --- 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 index 83e70ac38..bc3e7993e 100644 --- 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 index b914aaee2..1becd0c03 100644 --- 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,