projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/expire-mutes
[akkoma]
/
lib
/
pleroma
/
user
/
search.ex
diff --git
a/lib/pleroma/user/search.ex
b/lib/pleroma/user/search.ex
index d4fd310690e33f0c7d691f02e90aeb5ebac79ffd..b8c6486729e04ab920c89ec9a9f8151f147eba57 100644
(file)
--- a/
lib/pleroma/user/search.ex
+++ b/
lib/pleroma/user/search.ex
@@
-52,6
+52,7
@@
defmodule Pleroma.User.Search do
|> base_query(following)
|> filter_blocked_user(for_user)
|> filter_invisible_users()
|> base_query(following)
|> filter_blocked_user(for_user)
|> filter_invisible_users()
+ |> filter_discoverable_users()
|> filter_internal_users()
|> filter_blocked_domains(for_user)
|> fts_search(query_string)
|> filter_internal_users()
|> filter_blocked_domains(for_user)
|> fts_search(query_string)
@@
-115,13
+116,17
@@
defmodule Pleroma.User.Search do
)
end
)
end
- defp base_query(
_user, false), do: User
- defp base_query(
user, true), do: User.get_followers_query(user)
+ defp base_query(
%User{} = user, true), do: User.get_friends_query(user)
+ defp base_query(
_user, _following), do: User
defp filter_invisible_users(query) do
from(q in query, where: q.invisible == false)
end
defp filter_invisible_users(query) do
from(q in query, where: q.invisible == false)
end
+ defp filter_discoverable_users(query) do
+ from(q in query, where: q.discoverable == true)
+ end
+
defp filter_internal_users(query) do
from(q in query, where: q.actor_type != "Application")
end
defp filter_internal_users(query) do
from(q in query, where: q.actor_type != "Application")
end