From 14e4e2d340c7b2d6ff4c4e02013d7d2a82dd5df8 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Tue, 23 Feb 2021 09:49:27 -0600 Subject: [PATCH] Deleting a user from AdminAPI should use User.delete/1 --- lib/pleroma/web/admin_api/controllers/user_controller.ex | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/pleroma/web/admin_api/controllers/user_controller.ex b/lib/pleroma/web/admin_api/controllers/user_controller.ex index 9ac275396..9dbbf366d 100644 --- a/lib/pleroma/web/admin_api/controllers/user_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/user_controller.ex @@ -10,8 +10,6 @@ defmodule Pleroma.Web.AdminAPI.UserController do alias Pleroma.ModerationLog alias Pleroma.User - alias Pleroma.Web.ActivityPub.Builder - alias Pleroma.Web.ActivityPub.Pipeline alias Pleroma.Web.AdminAPI alias Pleroma.Web.AdminAPI.Search alias Pleroma.Web.Plugs.OAuthScopesPlug @@ -69,10 +67,7 @@ defmodule Pleroma.Web.AdminAPI.UserController do defp do_deletes(%{assigns: %{user: admin}} = conn, nicknames) when is_list(nicknames) do users = Enum.map(nicknames, &User.get_cached_by_nickname/1) - Enum.each(users, fn user -> - {:ok, delete_data, _} = Builder.delete(admin, user.ap_id) - Pipeline.common_pipeline(delete_data, local: true) - end) + Enum.each(users, &User.delete(&1)) ModerationLog.insert_log(%{ actor: admin,