AdminAPI: Omit relay user from users list
This commit is contained in:
parent
59a149c69a
commit
6f9d3d30fa
3 changed files with 40 additions and 2 deletions
|
|
@ -11,13 +11,17 @@ defmodule Pleroma.Web.ActivityPub.Relay do
|
|||
|
||||
def get_actor do
|
||||
actor =
|
||||
"#{Pleroma.Web.Endpoint.url()}/relay"
|
||||
relay_ap_id()
|
||||
|> User.get_or_create_service_actor_by_ap_id()
|
||||
|
||||
{:ok, actor} = User.set_invisible(actor, true)
|
||||
actor
|
||||
end
|
||||
|
||||
def relay_ap_id do
|
||||
"#{Pleroma.Web.Endpoint.url()}/relay"
|
||||
end
|
||||
|
||||
@spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
|
||||
def follow(target_instance) do
|
||||
with %User{} = local_user <- get_actor(),
|
||||
|
|
|
|||
|
|
@ -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} | %{}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue