hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'omit-nondiscoverable-from-search' into 'develop'

Browse source 
User search should respect discoverable flag

See merge request pleroma/pleroma!2997
This commit is contained in:
Haelwenn 2020-09-17 17:59:38 +00:00
commit beefc022dd
9 changed files with 56 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/user/search.ex
View file

@ -52,6 +52,7 @@ defmodule Pleroma.User.Search do
|> 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)
@ -122,6 +123,10 @@ defmodule Pleroma.User.Search 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