Add "local" params to users search
This commit is contained in:
parent
adac745512
commit
5b08b470f6
6 changed files with 87 additions and 39 deletions
|
|
@ -78,8 +78,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
)
|
||||
end
|
||||
|
||||
def search_users(%{assigns: %{user: admin}} = conn, %{"query" => query}) do
|
||||
users = User.search(query, true, admin, @users_page_size)
|
||||
def search_users(%{assigns: %{user: admin}} = conn, %{"query" => term} = params) do
|
||||
users =
|
||||
User.search(term,
|
||||
query: User.maybe_local_user_query(params["local"] == "true"),
|
||||
resolve: true,
|
||||
for_user: admin,
|
||||
limit: @users_page_size
|
||||
)
|
||||
|
||||
conn
|
||||
|> json(
|
||||
|
|
|
|||
|
|
@ -894,7 +894,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|||
end
|
||||
|
||||
def search2(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
|
||||
accounts = User.search(query, params["resolve"] == "true", user)
|
||||
accounts = User.search(query, resolve: params["resolve"] == "true", for_user: user)
|
||||
|
||||
statuses = status_search(user, query)
|
||||
|
||||
|
|
@ -919,7 +919,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|||
end
|
||||
|
||||
def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
|
||||
accounts = User.search(query, params["resolve"] == "true", user)
|
||||
accounts = User.search(query, resolve: params["resolve"] == "true", for_user: user)
|
||||
|
||||
statuses = status_search(user, query)
|
||||
|
||||
|
|
@ -941,7 +941,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
|||
end
|
||||
|
||||
def account_search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
|
||||
accounts = User.search(query, params["resolve"] == "true", user)
|
||||
accounts = User.search(query, resolve: params["resolve"] == "true", for_user: user)
|
||||
|
||||
res = AccountView.render("accounts.json", users: accounts, for: user, as: :user)
|
||||
|
||||
|
|
|
|||
|
|
@ -702,7 +702,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
|||
end
|
||||
|
||||
def search_user(%{assigns: %{user: user}} = conn, %{"query" => query}) do
|
||||
users = User.search(query, true, user)
|
||||
users = User.search(query, resolve: true, for_user: user)
|
||||
|
||||
conn
|
||||
|> put_view(UserView)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue