aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-07-03 11:02:15 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-07-03 11:02:15 +0300
commit90764670dc83c39c28cd7851f08f77f1e8bcf25a (patch)
treec075d10fc71086b5141051e3c6849e28a4f23aab /lib/pleroma
parent3d2989278c2f97fb5247d0b58b99b77f400f3185 (diff)
downloadpleroma-90764670dc83c39c28cd7851f08f77f1e8bcf25a.tar.gz
[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/user/search.ex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/user/search.ex b/lib/pleroma/user/search.ex
index 0293c6ae7..42ff1de78 100644
--- a/lib/pleroma/user/search.ex
+++ b/lib/pleroma/user/search.ex
@@ -52,7 +52,7 @@ defmodule Pleroma.User.Search do
|> base_query(following)
|> filter_blocked_user(for_user)
|> filter_invisible_users()
- |> filter_bots()
+ |> filter_internal_users()
|> filter_blocked_domains(for_user)
|> fts_search(query_string)
|> trigram_rank(query_string)
@@ -110,8 +110,8 @@ defmodule Pleroma.User.Search do
from(q in query, where: q.invisible == false)
end
- defp filter_bots(query) do
- from(q in query, where: q.actor_type not in ["Application", "Service"])
+ defp filter_internal_users(query) do
+ from(q in query, where: q.actor_type != "Application")
end
defp filter_blocked_user(query, %User{} = blocker) do