mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-06-08 16:29:23 +00:00
Deleting a user from AdminAPI should use User.delete/1
This commit is contained in:
parent
f775a1931b
commit
14e4e2d340
|
@ -10,8 +10,6 @@ defmodule Pleroma.Web.AdminAPI.UserController do
|
||||||
|
|
||||||
alias Pleroma.ModerationLog
|
alias Pleroma.ModerationLog
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Web.ActivityPub.Builder
|
|
||||||
alias Pleroma.Web.ActivityPub.Pipeline
|
|
||||||
alias Pleroma.Web.AdminAPI
|
alias Pleroma.Web.AdminAPI
|
||||||
alias Pleroma.Web.AdminAPI.Search
|
alias Pleroma.Web.AdminAPI.Search
|
||||||
alias Pleroma.Web.Plugs.OAuthScopesPlug
|
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
|
defp do_deletes(%{assigns: %{user: admin}} = conn, nicknames) when is_list(nicknames) do
|
||||||
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
|
users = Enum.map(nicknames, &User.get_cached_by_nickname/1)
|
||||||
|
|
||||||
Enum.each(users, fn user ->
|
Enum.each(users, &User.delete(&1))
|
||||||
{:ok, delete_data, _} = Builder.delete(admin, user.ap_id)
|
|
||||||
Pipeline.common_pipeline(delete_data, local: true)
|
|
||||||
end)
|
|
||||||
|
|
||||||
ModerationLog.insert_log(%{
|
ModerationLog.insert_log(%{
|
||||||
actor: admin,
|
actor: admin,
|
||||||
|
|
Loading…
Reference in a new issue