X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fsearch%2Fmeilisearch.ex;h=27a31afcf4a684f8d87dfb8daac2abe6a3c7a7e3;hb=b8f280b4b500a20eeb6046dd29e3070696da8977;hp=021552f7b718d31f069984bca657ae3215722756;hpb=cc3319ac1d7aed4a8010c7869cb7a4d8c7dd0dd7;p=akkoma

diff --git a/lib/mix/tasks/pleroma/search/meilisearch.ex b/lib/mix/tasks/pleroma/search/meilisearch.ex
index 021552f7b..27a31afcf 100644
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@@ -9,27 +9,39 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
   import Ecto.Query
 
   import Pleroma.Search.Meilisearch,
-    only: [meili_post: 2, meili_put: 2, meili_get: 1, meili_delete!: 1]
+    only: [meili_put: 2, meili_get: 1, meili_delete!: 1]
 
   def run(["index"]) do
     start_pleroma()
 
+    meili_version =
+      (
+        {:ok, result} = meili_get("/version")
+
+        result["pkgVersion"]
+      )
+
+    # The ranking rule syntax was changed but nothing about that is mentioned in the changelog
+    if not Version.match?(meili_version, ">= 0.25.0") do
+      raise "Meilisearch <0.24.0 not supported"
+    end
+
     {:ok, _} =
-      meili_post(
+      meili_put(
         "/indexes/objects/settings/ranking-rules",
         [
-          "desc(published)",
+          "published:desc",
           "words",
           "exactness",
           "proximity",
-          "wordsPosition",
           "typo",
-          "attribute"
+          "attribute",
+          "sort"
         ]
       )
 
     {:ok, _} =
-      meili_post(
+      meili_put(
         "/indexes/objects/settings/searchable-attributes",
         [
           "content"
@@ -79,7 +91,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
             )
 
           with {:ok, res} <- result do
-            if not Map.has_key?(res, "updateId") do
+            if not Map.has_key?(res, "indexUid") do
               IO.puts("\nFailed to index: #{inspect(result)}")
             end
           else
@@ -100,7 +112,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
     meili_delete!("/indexes/objects/documents")
   end
 
-  def run(["show-private-key", master_key]) do
+  def run(["show-keys", master_key]) do
     start_pleroma()
 
     endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
@@ -108,15 +120,17 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
     {:ok, result} =
       Pleroma.HTTP.get(
         Path.join(endpoint, "/keys"),
-        [{"X-Meili-API-Key", master_key}]
+        [{"Authorization", "Bearer #{master_key}"}]
       )
 
     decoded = Jason.decode!(result.body)
 
-    if decoded["private"] do
-      IO.puts(decoded["private"])
+    if decoded["results"] do
+      Enum.each(decoded["results"], fn %{"description" => desc, "key" => key} ->
+        IO.puts("#{desc}: #{key}")
+      end)
     else
-      IO.puts("Error fetching the key, check the master key is correct: #{inspect(decoded)}")
+      IO.puts("Error fetching the keys, check the master key is correct: #{inspect(decoded)}")
     end
   end