logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 32541172cd490d68ada7e65e9f59b71bb04e0bde
parent: 90e157ef803296989b41d1fbfb5096b39320f75d
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue,  1 Jan 2019 13:48:59 +0000

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

Diffstat:

Mlib/pleroma/web/admin_api/admin_api_controller.ex9++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -14,13 +14,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do action_fallback(:errors) def user_delete(conn, %{"nickname" => nickname}) do - user = User.get_by_nickname(nickname) - - if user.local == true do - User.delete(user) - else - User.delete(user) - end + User.get_by_nickname(nickname) + |> User.delete() conn |> json(nickname)