Commit 8d047c7a authored by kaniini's avatar kaniini
Browse files

Merge branch 'fix/user-search-null-name' into 'develop'

fix user search results for users with unset display name

Closes #499

See merge request !625
parents 0b54c3d6 a8130725
Pipeline #6030 passed with stages
in 3 minutes and 22 seconds
......@@ -610,7 +610,7 @@ def search(query, resolve \\ false) do
select_merge: %{
search_distance:
fragment(
"? <-> (? || ?)",
"? <-> (? || coalesce(?, ''))",
^query,
u.nickname,
u.name
......
......@@ -756,5 +756,15 @@ test "finds a user, ranking by similarity" do
assert user_four ==
User.search("lain@ple") |> List.first() |> Map.put(:search_distance, nil)
end
test "finds a user whose name is nil" do
_user = insert(:user, %{name: "notamatch", nickname: "testuser@pleroma.amplifie.red"})
user_two = insert(:user, %{name: nil, nickname: "lain@pleroma.soykaf.com"})
assert user_two ==
User.search("lain@pleroma.soykaf.com")
|> List.first()
|> Map.put(:search_distance, nil)
end
end
end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment