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

AdminAPI: Omit relay user from users list

Browse source
This commit is contained in:
Maxim Filippov 2019-10-31 02:26:02 +03:00
commit 6f9d3d30fa
3 changed files with 40 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -333,7 +333,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
email: params["email"]
}
with {:ok, users, count} <- Search.user(Map.merge(search_params, filters)),
with {:ok, users, _count} <- Search.user(Map.merge(search_params, filters)),
{:ok, users, count} <- filter_relay_user(users),
do:
conn
|> json(
@ -345,6 +346,12 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
)
end
defp filter_relay_user(users) do
filtered_users = Enum.reject(users, &(&1.ap_id == Relay.relay_ap_id()))
{:ok, filtered_users, length(filtered_users)}
end
@filters ~w(local external active deactivated is_admin is_moderator)
@spec maybe_parse_filters(String.t()) :: %{required(String.t()) => true} | %{}