Merge branch 'feature/allow-user-query-via-id' into 'develop'

Admin API: Allow querying user by ID

See merge request pleroma/pleroma!1380

lib/pleroma/web/admin_api/admin_api_controller.ex

@@ -74,7 +74,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
   end
 
   def user_show(conn, %{"nickname" => nickname}) do
-    with %User{} = user <- User.get_cached_by_nickname(nickname) do
+    with %User{} = user <- User.get_cached_by_nickname_or_id(nickname) do
       conn
       |> json(AccountView.render("show.json", %{user: user}))
     else