From e5a11a6399bfeaf6342fc78079e4c7fda02c2488 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 16 Aug 2022 23:41:34 +0100
Subject: [PATCH 1/4] fix compatibility with meilisearch

---
 lib/mix/tasks/pleroma/search/meilisearch.ex | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/mix/tasks/pleroma/search/meilisearch.ex b/lib/mix/tasks/pleroma/search/meilisearch.ex
index d4a83c3cd..27a31afcf 100644
--- a/lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/lib/mix/tasks/pleroma/search/meilisearch.ex
@@ -9,7 +9,7 @@ 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()
@@ -27,7 +27,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
     end
 
     {:ok, _} =
-      meili_post(
+      meili_put(
         "/indexes/objects/settings/ranking-rules",
         [
           "published:desc",
@@ -41,7 +41,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
       )
 
     {:ok, _} =
-      meili_post(
+      meili_put(
         "/indexes/objects/settings/searchable-attributes",
         [
           "content"
@@ -91,7 +91,7 @@ defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
             )
 
           with {:ok, res} <- result do
-            if not Map.has_key?(res, "uid") do
+            if not Map.has_key?(res, "indexUid") do
               IO.puts("\nFailed to index: #{inspect(result)}")
             end
           else
-- 
2.34.1


From 45aec319dd8ab788e7cc051fb3e8abf3d959f8c2 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 16 Aug 2022 23:50:31 +0100
Subject: [PATCH 2/4] fix resolution of mix tasks

---
 lib/pleroma/release_tasks.ex | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/release_tasks.ex b/lib/pleroma/release_tasks.ex
index 1e06aafe4..a3fbde397 100644
--- a/lib/pleroma/release_tasks.ex
+++ b/lib/pleroma/release_tasks.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.ReleaseTasks do
         module = Module.split(module)
 
         match?(["Mix", "Tasks", "Pleroma" | _], module) and
-          String.downcase(List.last(module)) == task
+          task_match?(module, task)
       end)
 
     if module do
@@ -35,6 +35,13 @@ defmodule Pleroma.ReleaseTasks do
     end
   end
 
+  defp task_match?(module_path, task) do
+    module_path
+    |> Enum.join(".")
+    |> String.downcase()
+    |> String.ends_with?(String.downcase(task))
+  end
+
   def migrate(args) do
     Mix.Tasks.Pleroma.Ecto.Migrate.run(args)
   end
-- 
2.34.1


From a07e282c4e90801e9cca05936f2a9b4db057b5ae Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 16 Aug 2022 23:52:25 +0100
Subject: [PATCH 3/4] add changelog entry

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c7cd8601..3618211e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
+### Fixed
+- Compatibility with latest meilisearch
+- Resolution of nested mix tasks (i.e search.meilisearch) in OTP releases
+
 ### Removed
 - Non-finch HTTP adapters. `:tesla, :adapter` is now highly recommended to be set to the default.
 
-- 
2.34.1


From 49cca76b5200ad6a772ad14197766e1ab37dc6a2 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 16 Aug 2022 23:56:30 +0100
Subject: [PATCH 4/4] make resolution of tasks less flimsy

---
 lib/pleroma/release_tasks.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/release_tasks.ex b/lib/pleroma/release_tasks.ex
index a3fbde397..e43eef070 100644
--- a/lib/pleroma/release_tasks.ex
+++ b/lib/pleroma/release_tasks.ex
@@ -35,11 +35,11 @@ defmodule Pleroma.ReleaseTasks do
     end
   end
 
-  defp task_match?(module_path, task) do
+  defp task_match?(["Mix", "Tasks", "Pleroma" | module_path], task) do
     module_path
     |> Enum.join(".")
     |> String.downcase()
-    |> String.ends_with?(String.downcase(task))
+    |> String.equivalent?(String.downcase(task))
   end
 
   def migrate(args) do
-- 
2.34.1