feature/elasticsearch #1

Merged
floatingghost merged 41 commits from feature/elasticsearch into develop 2021-12-12 17:37:28 +00:00
2 changed files with 6 additions and 4 deletions
Showing only changes of commit 9e263ed65c - Show all commits

View file

@ -120,7 +120,7 @@ defmodule Pleroma.Elasticsearch do
)
end
def bulk_post(data, :hashtags) do
def bulk_post([] = data, :hashtags) do
d =
data
|> Enum.map(fn d ->
@ -139,6 +139,8 @@ defmodule Pleroma.Elasticsearch do
)
end
def bulk_post(_, :hashtags), do: {:ok, nil}
def search(:raw, index, type, q) do
with {:ok, raw_results} <- Elastix.Search.search(url(), index, [type], q) do
results =

View file

@ -7,7 +7,7 @@ defmodule Pleroma.Search.Elasticsearch do
alias Pleroma.Search.Elasticsearch.Parsers
alias Pleroma.Web.Endpoint
defp es_query(:activity, query) do
def es_query(:activity, query) do
%{
size: 50,
terminate_after: 50,
@ -23,7 +23,7 @@ defmodule Pleroma.Search.Elasticsearch do
}
end
defp es_query(:user, query) do
def es_query(:user, query) do
%{
size: 50,
terminate_after: 50,
@ -36,7 +36,7 @@ defmodule Pleroma.Search.Elasticsearch do
}
end
defp es_query(:hashtag, query) do
def es_query(:hashtag, query) do
%{
size: 50,
terminate_after: 50,