darkkirb/akkoma
1
0
Fork 0
forked from mirrors/akkoma
Code Pull requests Activity

fix empty queries returning 50 results

Browse source
This commit is contained in:
sadposter 2021-12-14 15:02:11 +00:00
parent 8378c3a8bc
commit d1bb10c88e
2 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/elasticsearch/store.ex
View file

@ -142,6 +142,8 @@ defmodule Pleroma.Elasticsearch do
def bulk_post(_, :hashtags), do: {:ok, nil}
def search(_, _, _, :skip), do: []
def search(:raw, index, type, q) do
with {:ok, raw_results} <- Elastix.Search.search(url(), index, [type], q) do
results =

72
lib/pleroma/search/elasticsearch.ex
View file

@ -8,45 +8,63 @@ defmodule Pleroma.Search.Elasticsearch do
alias Pleroma.Web.Endpoint
def es_query(:activity, query) do
%{
size: 50,
terminate_after: 50,
timeout: "5s",
sort: [
%{"_timestamp" => "desc"}
],
query: %{
bool: %{
must: Parsers.Activity.parse(query)
must = Parsers.Activity.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
timeout: "5s",
sort: [
%{"_timestamp" => "desc"}
],
query: %{
bool: %{
must: must
}
}
}
}
end
end
def es_query(:user, query) do
%{
size: 50,
terminate_after: 50,
timeout: "5s",
query: %{
bool: %{
must: Parsers.User.parse(query)
must = Parsers.User.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
timeout: "5s",
query: %{
bool: %{
must: must
}
}
}
}
end
end
def es_query(:hashtag, query) do
%{
size: 50,
terminate_after: 50,
timeout: "5s",
query: %{
bool: %{
must: Parsers.Hashtag.parse(query)
must = Parsers.Hashtag.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
timeout: "5s",
query: %{
bool: %{
must: Parsers.Hashtag.parse(query)
}
}
}
}
end
end
@impl Pleroma.Search