Merge search behaviour change, and refactor elasticsearch #28

Merged
floatingghost merged 91 commits from elasticsearch-refactor into develop 2022-06-30 16:55:31 +00:00
2 changed files with 21 additions and 1 deletions
Showing only changes of commit d1079f1aa3 - Show all commits

View file

@ -9,7 +9,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
import Mix.Pleroma import Mix.Pleroma
import Ecto.Query import Ecto.Query
import Pleroma.Search.Meilisearch, only: [meili_post!: 2, meili_delete!: 1] import Pleroma.Search.Meilisearch, only: [meili_post!: 2, meili_delete!: 1, meili_get!: 1]
def run(["index"]) do def run(["index"]) do
start_pleroma() start_pleroma()
@ -111,4 +111,12 @@ def run(["show-private-key", master_key]) do
IO.puts("Error fetching the key, check the master key is correct: #{inspect(decoded)}") IO.puts("Error fetching the key, check the master key is correct: #{inspect(decoded)}")
end end
end end
def run(["stats"]) do
start_pleroma()
result = meili_get!("/indexes/objects/stats")
IO.puts("Number of entries: #{result["numberOfDocuments"]}")
IO.puts("Indexing? #{result["isIndexing"]}")
end
end end

View file

@ -13,6 +13,18 @@ defp meili_headers() do
if is_nil(private_key), do: [], else: [{"X-Meili-API-Key", private_key}] if is_nil(private_key), do: [], else: [{"X-Meili-API-Key", private_key}]
end end
def meili_get!(path) do
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
{:ok, result} =
Pleroma.HTTP.get(
Path.join(endpoint, path),
meili_headers()
)
Jason.decode!(result.body)
end
def meili_post!(path, params) do def meili_post!(path, params) do
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url]) endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])