Bladeren bron

excluded invisible users from search results

feature/user-whitelist
Maksim Pechnikov 4 jaren geleden
bovenliggende
commit
62bc0657e7
2 gewijzigde bestanden met toevoegingen van 13 en 0 verwijderingen
  1. +5
    -0
      lib/pleroma/user/search.ex
  2. +8
    -0
      test/user_search_test.exs

+ 5
- 0
lib/pleroma/user/search.ex Bestand weergeven

@@ -45,6 +45,7 @@ defmodule Pleroma.User.Search do
for_user
|> base_query(following)
|> filter_blocked_user(for_user)
|> filter_invisible_users()
|> filter_blocked_domains(for_user)
|> fts_search(query_string)
|> trigram_rank(query_string)
@@ -98,6 +99,10 @@ defmodule Pleroma.User.Search do
defp base_query(_user, false), do: User
defp base_query(user, true), do: User.get_followers_query(user)

defp filter_invisible_users(query) do
from(q in query, where: q.invisible == false)
end

defp filter_blocked_user(query, %User{blocks: blocks})
when length(blocks) > 0 do
from(q in query, where: not (q.ap_id in ^blocks))


+ 8
- 0
test/user_search_test.exs Bestand weergeven

@@ -15,6 +15,14 @@ defmodule Pleroma.UserSearchTest do
end

describe "User.search" do
test "excluded invisible users from results" do
user = insert(:user, %{nickname: "john t1000"})
insert(:user, %{invisible: true, nickname: "john t800"})

[found_user] = User.search("john")
assert found_user.id == user.id
end

test "accepts limit parameter" do
Enum.each(0..4, &insert(:user, %{nickname: "john#{&1}"}))
assert length(User.search("john", limit: 3)) == 3


Laden…
Annuleren
Opslaan