pleroma

commit: c7eda0b24ade372e4e167ae560a2debb555a6e02
parent 029aaf3d744184737666b1e553ed92d7708f1fee
Author: Mark Felder <feld@feld.me>
Date:   Sat, 20 Jan 2024 18:22:49 -0500

Use config to control loading of custom modules

Diffstat:
M
config/config.exs
2
++
M
config/test.exs
5
++++-
M
lib/pleroma/application.ex
34
++++++++++++++++------------------
M
lib/pleroma/user.ex
3
++-
M
lib/pleroma/web/o_auth/token.ex
3
++-

5 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -905,6 +905,8 @@ config :pleroma, Pleroma.Search.Meilisearch,
   initial_indexing_chunk_size: 100_000
 
 config :pleroma, Pleroma.Application,
+  internal_fetch: true,
+  load_custom_modules: true,
   max_restarts: 3
 
 # Import environment specific config. This must remain at the bottom
diff --git a/config/test.exs b/config/test.exs
@@ -162,7 +162,10 @@ peer_module =
 
 config :pleroma, Pleroma.Cluster, peer_module: peer_module
 
-config :pleroma, Pleroma.Application, max_restarts: 100
+config :pleroma, Pleroma.Application,
+  internal_fetch: false,
+  load_custom_modules: false,
+  max_restarts: 100
 
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -106,7 +106,7 @@ defmodule Pleroma.Application do
           {Oban, Config.get(Oban)},
           Pleroma.Web.Endpoint
         ] ++
-        task_children(@mix_env) ++
+        task_children() ++
         dont_run_in_test(@mix_env) ++
         shout_child(shout_enabled?()) ++
         [Pleroma.Gopher.Server]
@@ -154,7 +154,7 @@ defmodule Pleroma.Application do
           raise "Invalid custom modules"
 
         {:ok, modules, _warnings} ->
-          if @mix_env != :test do
+          if Application.get_env(:pleroma, __MODULE__)[:load_custom_modules] do
             Enum.each(modules, fn mod ->
               Logger.info("Custom module loaded: #{inspect(mod)}")
             end)
@@ -237,29 +237,27 @@ defmodule Pleroma.Application do
 
   defp shout_child(_), do: []
 
-  defp task_children(:test) do
-    [
+  defp task_children() do
+    children = [
       %{
         id: :web_push_init,
         start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
         restart: :temporary
       }
     ]
-  end
 
-  defp task_children(_) do
-    [
-      %{
-        id: :web_push_init,
-        start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
-        restart: :temporary
-      },
-      %{
-        id: :internal_fetch_init,
-        start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
-        restart: :temporary
-      }
-    ]
+    if Application.get_env(:pleroma, __MODULE__)[:internal_fetch] do
+      children ++
+        [
+          %{
+            id: :internal_fetch_init,
+            start: {Task, :start_link, [&Pleroma.Web.ActivityPub.InternalFetchActor.init/0]},
+            restart: :temporary
+          }
+        ]
+    else
+      children
+    end
   end
 
   # start hackney and gun pools in tests
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -1048,7 +1048,8 @@ defmodule Pleroma.User do
 
   def needs_update?(_), do: true
 
-  @spec maybe_direct_follow(User.t(), User.t()) :: {:ok, User.t(), User.t()} | {:error, String.t()}
+  @spec maybe_direct_follow(User.t(), User.t()) ::
+          {:ok, User.t(), User.t()} | {:error, String.t()}
 
   # "Locked" (self-locked) users demand explicit authorization of follow requests
   def maybe_direct_follow(%User{} = follower, %User{local: true, is_locked: true} = followed) do
diff --git a/lib/pleroma/web/o_auth/token.ex b/lib/pleroma/web/o_auth/token.ex
@@ -56,7 +56,8 @@ defmodule Pleroma.Web.OAuth.Token do
     |> Repo.find_resource()
   end
 
-  @spec exchange_token(App.t(), Authorization.t()) :: {:ok, Token.t()} | {:error, Ecto.Changeset.t()}
+  @spec exchange_token(App.t(), Authorization.t()) ::
+          {:ok, Token.t()} | {:error, Ecto.Changeset.t()}
   def exchange_token(app, auth) do
     with {:ok, auth} <- Authorization.use_token(auth),
          true <- auth.app_id == app.id do