sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor a little bit

Browse Source
This commit is contained in:
Maxim Filippov 2019-03-01 21:17:20 +03:00
parent a25c1313ae
commit f635b675b2
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pleroma/user.ex
View File

@ -763,17 +763,13 @@ def search(term, options \\ %{}) do
if options[:resolve], do: get_or_fetch(term)
fts_results =
do_search(fts_search_subquery(term, query), options[:for_user], %{
limit: options[:limit]
})
do_search(fts_search_subquery(term, query), options[:for_user], limit: options[:limit])
{:ok, trigram_results} =
Repo.transaction(fn ->
Ecto.Adapters.SQL.query(Repo, "select set_limit(0.25)", [])
do_search(trigram_search_subquery(term, query), options[:for_user], %{
limit: options[:limit]
})
do_search(trigram_search_subquery(term, query), options[:for_user], limit: options[:limit])
end)
Enum.uniq_by(fts_results ++ trigram_results, & &1.id)
@ -1024,12 +1020,8 @@ def unblock_domain(user, domain) do
update_and_set_cache(cng)
end
def maybe_local_user_query(local) when local == true do
local_user_query()
end
def maybe_local_user_query(local) when local == false do
User
def maybe_local_user_query(local) do
if local, do: local_user_query(), else: User
end
def local_user_query do

8
lib/pleroma/web/admin_api/admin_api_controller.ex
View File

@ -70,11 +70,11 @@ def list_users(%{assigns: %{user: admin}} = conn, %{"page" => page_string}) do
do:
conn
|> json(
AccountView.render("index.json", %{
AccountView.render("index.json",
users: users,
count: count,
page_size: @users_page_size
})
)
)
end
@ -89,11 +89,11 @@ def search_users(%{assigns: %{user: admin}} = conn, %{"query" => term} = params)
conn
|> json(
AccountView.render("index.json", %{
AccountView.render("index.json",
users: users,
count: length(users),
page_size: @users_page_size
})
)
)
end