commit: 8d047c7a72c961f84518b879b6bd92e7a40dabb2
parent: 0b54c3d6432dea77542596e34057f8d3fc69ca4c
Author: kaniini <nenolod@gmail.com>
Date: Sat, 5 Jan 2019 22:34:47 +0000
Merge branch 'fix/user-search-null-name' into 'develop'
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
Diffstat:
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -610,7 +610,7 @@ defmodule Pleroma.User do
select_merge: %{
search_distance:
fragment(
- "? <-> (? || ?)",
+ "? <-> (? || coalesce(?, ''))",
^query,
u.nickname,
u.name
diff --git a/test/user_test.exs b/test/user_test.exs
@@ -756,5 +756,15 @@ defmodule Pleroma.UserTest 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