diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-01 13:48:59 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-01 13:48:59 +0000 |
| commit | 32541172cd490d68ada7e65e9f59b71bb04e0bde (patch) | |
| tree | e86ff61446927bbf89ba986815c05043bcf0558f /lib | |
| parent | 90e157ef803296989b41d1fbfb5096b39320f75d (diff) | |
| parent | 1e6c102bfcfe0e4835a48f2483f2376f9bf86a20 (diff) | |
| download | pleroma-32541172cd490d68ada7e65e9f59b71bb04e0bde.tar.gz | |
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 (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 9 |
1 files 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 index f6d90b552..dc01f46f3 100644 --- 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) |