Commit ed8f55ab authored by Ivan Tashkinov's avatar Ivan Tashkinov

[#477] User: FTS and trigram search results mixing (to handle misspelled requests).

parent 0bc6d30f
......@@ -679,48 +679,24 @@ def get_recipients_from_activity(%Activity{recipients: to}) do
end
def search(query, resolve \\ false, for_user \\ nil) do
# strip the beginning @ off if there is a query
# Strip the beginning @ off if there is a query
query = String.trim_leading(query, "@")
if resolve do
User.get_or_fetch_by_nickname(query)
end
if resolve, do: User.get_or_fetch_by_nickname(query)
processed_query =
query
|> String.replace(~r/\W+/, " ")
|> String.trim()
|> String.split()
|> Enum.map(&(&1 <> ":*"))
|> Enum.join(" | ")
fts_results = do_search(fts_search_subquery(query), for_user)
inner =
from(
u in User,
select_merge: %{
search_rank:
fragment(
"""
ts_rank_cd(
setweight(to_tsvector('simple', regexp_replace(?, '\\W', ' ', 'g')), 'A') ||
setweight(to_tsvector('simple', regexp_replace(coalesce(?, ''), '\\W', ' ', 'g')), 'B'),
to_tsquery('simple', ?),
32
)
""",
u.nickname,
u.name,
^processed_query
)
},
where: not is_nil(u.nickname)
)
trigram_results = do_search(trigram_search_subquery(query), for_user)
Enum.uniq_by(fts_results ++ trigram_results, & &1.id)
end
defp do_search(subquery, for_user, options \\ []) do
q =
from(
s in subquery(inner),
s in subquery(subquery),
order_by: [desc: s.search_rank],
limit: 20
limit: ^(options[:limit] || 20)
)
results =
......@@ -728,35 +704,81 @@ def search(query, resolve \\ false, for_user \\ nil) do
|> Repo.all()
|> Enum.filter(&(&1.search_rank > 0))
weighted_results =
if for_user do
friends_ids = get_friends_ids(for_user)
followers_ids = get_followers_ids(for_user)
boost_search_results(results, for_user)
end
Enum.map(
results,
fn u ->
search_rank_coef =
cond do
u.id in friends_ids ->
1.2
defp fts_search_subquery(query) do
processed_query =
query
|> String.replace(~r/\W+/, " ")
|> String.trim()
|> String.split()
|> Enum.map(&(&1 <> ":*"))
|> Enum.join(" | ")
from(
u in User,
select_merge: %{
search_rank:
fragment(
"""
ts_rank_cd(
setweight(to_tsvector('simple', regexp_replace(?, '\\W', ' ', 'g')), 'A') ||
setweight(to_tsvector('simple', regexp_replace(coalesce(?, ''), '\\W', ' ', 'g')), 'B'),
to_tsquery('simple', ?),
32
)
""",
u.nickname,
u.name,
^processed_query
)
},
where: not is_nil(u.nickname)
)
end
defp trigram_search_subquery(query) do
from(
u in User,
select_merge: %{
search_rank:
fragment(
"similarity(?, ? || ' ' || coalesce(?, ''))",
^query,
u.nickname,
u.name
)
},
where: not is_nil(u.nickname)
)
end
u.id in followers_ids ->
1.1
defp boost_search_results(results, nil), do: results
true ->
1
end
defp boost_search_results(results, for_user) do
friends_ids = get_friends_ids(for_user)
followers_ids = get_followers_ids(for_user)
Map.put(u, :search_rank, u.search_rank * search_rank_coef)
Enum.map(
results,
fn u ->
search_rank_coef =
cond do
u.id in friends_ids ->
1.2
u.id in followers_ids ->
1.1
true ->
1
end
)
|> Enum.sort_by(&(-&1.search_rank))
else
results
end
weighted_results
Map.put(u, :search_rank, u.search_rank * search_rank_coef)
end
)
|> Enum.sort_by(&(-&1.search_rank))
end
def blocks_import(%User{} = blocker, blocked_identifiers) when is_list(blocked_identifiers) do
......
......@@ -814,6 +814,12 @@ test "finds users, ranking by similarity" do
assert [u4.id, u3.id, u1.id] == Enum.map(User.search("lain@ple"), & &1.id)
end
test "finds users, handling misspelled requests" do
u1 = insert(:user, %{name: "lain"})
assert [u1.id] == Enum.map(User.search("laiin"), & &1.id)
end
test "finds users, boosting ranks of friends and followers" do
u1 = insert(:user)
u2 = insert(:user, %{name: "Doe"})
......
......@@ -1656,7 +1656,7 @@ test "it denies a friend request" do
test "it returns users, ordered by similarity", %{conn: conn} do
user = insert(:user, %{name: "eal"})
user_two = insert(:user, %{name: "eal me"})
_user_three = insert(:user, %{name: "ebn"})
_user_three = insert(:user, %{name: "zzz"})
resp =
conn
......
Markdown is supported
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