Merge branch 'cleanup/admin-api-useless-if' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 1 Jan 2019 13:48:59 +0000 (13:48 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 1 Jan 2019 13:48:59 +0000 (13:48 +0000)
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612

1  2 
lib/pleroma/web/admin_api/admin_api_controller.ex

index f6d90b552e19282a9ae4d0195835b963361bb69a,2b66a18488a7c325020989e6ab8ff264a423c997..dc01f46f38a1d062498a773d9ed964cb643e84cc
@@@ -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
    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)