mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-18 10:59:17 +00:00
Code Issues Wiki Activity

fix empty queries returning 50 results

Browse source
This commit is contained in:
sadposter 2021-12-14 15:02:11 +00:00 committed by FloatingGhost
parent 7f30218b82
commit c50ad91d31
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

@ -141,6 +141,8 @@ def bulk_post([] = data, :hashtags) 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 =

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

@ -8,6 +8,11 @@ defmodule Pleroma.Search.Elasticsearch do
alias Pleroma.Web.Endpoint
def es_query(:activity, query) do
must = Parsers.Activity.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
@ -17,26 +22,38 @@ def es_query(:activity, query) do
],
query: %{
bool: %{
must: Parsers.Activity.parse(query)
must: must
}
}
}
end
end
def es_query(:user, query) do
must = Parsers.User.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
timeout: "5s",
query: %{
bool: %{
must: Parsers.User.parse(query)
must: must
}
}
}
end
end
def es_query(:hashtag, query) do
must = Parsers.Hashtag.parse(query)
if must == [] do
:skip
else
%{
size: 50,
terminate_after: 50,
@ -48,6 +65,7 @@ def es_query(:hashtag, query) do
}
}
end
end
@impl Pleroma.Search
def search(%{assigns: %{user: user}} = _conn, %{q: query} = _params, _options) do