some refactor

2 files changed, 14 insertions, 6 deletions

diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index ea14894c7..fea22070f 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -628,14 +628,14 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
 
   def restart(conn, _params) do
     with :ok <- configurable_from_database() do
-      Task.start(Pleroma.Application.DynamicSupervisor, :restart_children, [])
+      Task.start(Pleroma.Application.DependenciesSupervisor, :restart_children, [])
 
       json(conn, %{})
     end
   end
 
   def need_reboot(conn, _params) do
-    json(conn, %{need_reboot: Pleroma.Application.DynamicSupervisor.need_reboot?()})
+    json(conn, %{need_reboot: Pleroma.Application.DependenciesSupervisor.need_reboot?()})
   end
 
   defp configurable_from_database do
diff --git a/lib/pleroma/web/admin_api/controllers/config_controller.ex b/lib/pleroma/web/admin_api/controllers/config_controller.ex
index 25086172c..f53e85fff 100644
--- a/lib/pleroma/web/admin_api/controllers/config_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/config_controller.ex
@@ -5,6 +5,7 @@
 defmodule Pleroma.Web.AdminAPI.ConfigController do
   use Pleroma.Web, :controller
 
+  alias Pleroma.Application.DependenciesSupervisor
   alias Pleroma.Config
   alias Pleroma.ConfigDB
   alias Pleroma.Plugs.OAuthScopesPlug
@@ -34,7 +35,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
 
       render(conn, "index.json", %{
         configs: configs,
-        need_reboot: Pleroma.Application.DynamicSupervisor.need_reboot?()
+        need_reboot: DependenciesSupervisor.need_reboot?()
       })
     end
   end
@@ -75,7 +76,7 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
 
       render(conn, "index.json", %{
         configs: merged,
-        need_reboot: Pleroma.Application.DynamicSupervisor.need_reboot?()
+        need_reboot: DependenciesSupervisor.need_reboot?()
       })
     end
   end
@@ -103,11 +104,18 @@ defmodule Pleroma.Web.AdminAPI.ConfigController do
 
       Config.Environment.load_and_update(deleted)
 
-      Pleroma.Application.DynamicSupervisor.save_need_reboot_paths(updated ++ deleted)
+      (updated ++ deleted)
+      |> Enum.map(fn %{group: group, key: key, value: value} ->
+        with {path, _} <- Pleroma.Application.Dependencies.find_relation(group, key, value) do
+          path
+        end
+      end)
+      |> Enum.filter(& &1)
+      |> DependenciesSupervisor.put_paths()
 
       render(conn, "index.json", %{
         configs: updated,
-        need_reboot: Pleroma.Application.DynamicSupervisor.need_reboot?()
+        need_reboot: DependenciesSupervisor.need_reboot?()
       })
     end
   end