Merge branch '1892-exclude-bots-from-search-results' into 'develop'

[#1892] Exclusion of service actors from user search results

Closes #1892

See merge request pleroma/pleroma!2708
This commit is contained in:
lain 2020-07-03 14:38:22 +00:00
commit 19fbfbb767
2 changed files with 15 additions and 1 deletions

View file

@ -52,6 +52,7 @@ defmodule Pleroma.User.Search do
|> base_query(following)
|> filter_blocked_user(for_user)
|> filter_invisible_users()
|> filter_internal_users()
|> filter_blocked_domains(for_user)
|> fts_search(query_string)
|> trigram_rank(query_string)
@ -109,6 +110,10 @@ defmodule Pleroma.User.Search do
from(q in query, where: q.invisible == false)
end
defp filter_internal_users(query) do
from(q in query, where: q.actor_type != "Application")
end
defp filter_blocked_user(query, %User{} = blocker) do
query
|> join(:left, [u], b in Pleroma.UserRelationship,