From: lambda <pleromagit@rogerbraun.net>
Date: Tue, 1 Jan 2019 13:48:59 +0000 (+0000)
Subject: Merge branch 'cleanup/admin-api-useless-if' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=32541172cd490d68ada7e65e9f59b71bb04e0bde;hp=-c;p=akkoma

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
---

32541172cd490d68ada7e65e9f59b71bb04e0bde
diff --combined lib/pleroma/web/admin_api/admin_api_controller.ex
index f6d90b552,2b66a1848..dc01f46f3
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@@ -1,5 -1,5 +1,5 @@@
  # Pleroma: A lightweight social networking server
 -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
 +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.AdminAPI.AdminAPIController do
@@@ -14,13 -14,8 +14,8 @@@
    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)