projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor a little bit
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index af3ce705d9c307d0a7661bc20b9c66c5415e310b..3c6fb4f9b614f46ed9f9a225527bc64ad9322e89 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-763,26
+763,21
@@
defmodule Pleroma.User do
if options[:resolve], do: get_or_fetch(term)
fts_results =
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)", [])
{: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)
end
end)
Enum.uniq_by(fts_results ++ trigram_results, & &1.id)
end
- def all
_except_one(user,
page, page_size) do
+ def all
(
page, page_size) do
from(
u in User,
from(
u in User,
- where: u.id != ^user.id,
limit: ^page_size,
offset: ^((page - 1) * page_size),
order_by: u.id
limit: ^page_size,
offset: ^((page - 1) * page_size),
order_by: u.id
@@
-1025,12
+1020,8
@@
defmodule Pleroma.User do
update_and_set_cache(cng)
end
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
end
def local_user_query do