pleroma

commit: 2482d561536d4c37eacf7a57503ea9e888ecd1f4
parent dcb0c47773c0bcb8162f9d6100e8a6a3a1ae36c7
Author: lain <lain@soykaf.club>
Date:   Thu, 21 Nov 2024 13:15:33 +0000

Merge branch 'fix-module-search-in-pleroma-ctl' into 'develop'

B ReleaseTasks: Fix task module finding.

See merge request pleroma/pleroma!4297
Diffstat:
A
changelog.d/module-search-in-pleroma-ctl.fix
1
+
M
lib/pleroma/release_tasks.ex
23
+++++++++++++++--------
A
test/pleroma/release_task_test.exs
19
+++++++++++++++++++

3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/changelog.d/module-search-in-pleroma-ctl.fix b/changelog.d/module-search-in-pleroma-ctl.fix
@@ -0,0 +1 @@
+Fix pleroma_ctl mix task calls sometimes not being found
diff --git a/lib/pleroma/release_tasks.ex b/lib/pleroma/release_tasks.ex
@@ -16,17 +16,24 @@ defmodule Pleroma.ReleaseTasks do
     end
   end
 
+  def find_module(task) do
+    module_name =
+      task
+      |> String.split(".")
+      |> Enum.map(&String.capitalize/1)
+      |> then(fn x -> [Mix, Tasks, Pleroma] ++ x end)
+      |> Module.concat()
+
+    case Code.ensure_loaded(module_name) do
+      {:module, _} -> module_name
+      _ -> nil
+    end
+  end
+
   defp mix_task(task, args) do
     Application.load(:pleroma)
-    {:ok, modules} = :application.get_key(:pleroma, :modules)
-
-    module =
-      Enum.find(modules, fn module ->
-        module = Module.split(module)
 
-        match?(["Mix", "Tasks", "Pleroma" | _], module) and
-          String.downcase(List.last(module)) == task
-      end)
+    module = find_module(task)
 
     if module do
       module.run(args)
diff --git a/test/pleroma/release_task_test.exs b/test/pleroma/release_task_test.exs
@@ -0,0 +1,19 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.ReleaseTaskTest do
+  use Pleroma.DataCase, async: true
+
+  alias Pleroma.ReleaseTasks
+
+  test "finding the module" do
+    task = "search.meilisearch"
+    assert Mix.Tasks.Pleroma.Search.Meilisearch == ReleaseTasks.find_module(task)
+
+    task = "user"
+    assert Mix.Tasks.Pleroma.User == ReleaseTasks.find_module(task)
+
+    refute ReleaseTasks.find_module("doesnt.exist")
+  end
+end