Merge branch 'cleanup/admin-api-useless-if' into 'develop'

Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612
This commit is contained in:
lambda 2019-01-01 13:48:59 +00:00
commit 32541172cd
1 changed files with 2 additions and 7 deletions

View File

@ -14,13 +14,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
action_fallback(:errors) action_fallback(:errors)
def user_delete(conn, %{"nickname" => nickname}) do def user_delete(conn, %{"nickname" => nickname}) do
user = User.get_by_nickname(nickname) User.get_by_nickname(nickname)
|> User.delete()
if user.local == true do
User.delete(user)
else
User.delete(user)
end
conn conn
|> json(nickname) |> json(nickname)