sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 05:35:06 +01:00
Code Issues Releases Wiki Activity

[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.

Browse Source
This commit is contained in:
Ivan Tashkinov 2020-07-03 11:02:15 +03:00
parent 3d2989278c
commit 90764670dc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/user/search.ex
View File

@ -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

10
test/user_search_test.exs
View File

@ -25,11 +25,13 @@ defmodule Pleroma.UserSearchTest do
assert found_user.id == user.id
end
test "excludes bots from results" do
insert(:user, actor_type: "Service", nickname: "bot1")
insert(:user, actor_type: "Application", nickname: "bot2")
test "excludes service actors from results" do
insert(:user, actor_type: "Application", nickname: "user1")
service = insert(:user, actor_type: "Service", nickname: "user2")
person = insert(:user, actor_type: "Person", nickname: "user3")
assert [] = User.search("bot")
assert [found_user1, found_user2] = User.search("user")
assert [found_user1.id, found_user2.id] -- [service.id, person.id] == []
end
test "accepts limit parameter" do