diff options
| author | kaniini <nenolod@gmail.com> | 2019-07-09 17:53:41 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-07-09 17:53:41 +0000 |
| commit | 670a77ecbc94d57c6ecb5e569597e81cee4b5532 (patch) | |
| tree | 4f00d76cc36b45ea1b99f5087d800e88f71c232c /lib | |
| parent | 1417627d07a29e06efec2b282405e72bcfb1269c (diff) | |
| parent | 9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (diff) | |
| download | pleroma-670a77ecbc94d57c6ecb5e569597e81cee4b5532.tar.gz | |
Merge branch 'feature/allow-user-query-via-id' into 'develop'
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 498beb56a..0a2482a8c 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/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 |