diff options
author | lain <lain@soykaf.club> | 2020-07-23 12:52:02 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-23 12:52:02 +0000 |
commit | 76aa49a0c5be0d1d51e99fd30683b12c8edc653d (patch) | |
tree | 5d7942ba21ad06f7a85ecfc3349d3351d59c32cf /lib/pleroma/web/admin_api/controllers | |
parent | b2ba70eec437e81b8c1c2be3081858be38a73c61 (diff) | |
parent | 9ea51a6de516b37341a9566d11d0110c2d87c1b6 (diff) | |
download | pleroma-76aa49a0c5be0d1d51e99fd30683b12c8edc653d.tar.gz |
Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting
Closes #1973
See merge request pleroma/pleroma!2791
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers')
-rw-r--r-- | lib/pleroma/web/admin_api/controllers/admin_api_controller.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex index c10181bae..5101e28d6 100644 --- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex @@ -345,7 +345,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do with {:ok, users, count} <- Search.user(Map.merge(search_params, filters)) do json( conn, - AccountView.render("index.json", users: users, count: count, page_size: page_size) + AccountView.render("index.json", + users: users, + count: count, + page_size: page_size + ) ) end end |