hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge search endpoint into /users

Browse source
This commit is contained in:
Maxim Filippov 2019-03-04 21:26:32 +03:00
commit f620199836
4 changed files with 97 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/pleroma/web/admin_api/admin_api_controller.ex
View file

@ -63,28 +63,29 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
do: json_response(conn, :no_content, "")
end
def list_users(conn, params) do
{page, page_size} = page_params(params)
# def list_users(conn, params) do
# {page, page_size} = page_params(params)
with {:ok, users, count} <- User.all_for_admin(page, page_size),
do:
conn
|> json(
AccountView.render("index.json",
users: users,
count: count,
page_size: page_size
)
)
end
# with {:ok, users, count} <- User.all_for_admin(page, page_size),
# do:
# conn
# |> json(
# AccountView.render("index.json",
# users: users,
# count: count,
# page_size: page_size
# )
# )
# end
def search_users(%{assigns: %{user: admin}} = conn, %{"query" => query} = params) do
def list_users(%{assigns: %{user: admin}} = conn, params) do
{page, page_size} = page_params(params)
with {:ok, users, count} <-
User.search_for_admin(query, %{
User.search_for_admin(%{
query: params["query"],
admin: admin,
local: params["local"] == "true",
local: params["local_only"] == "true",
page: page,
page_size: page_size
}),