Get rid of Pleroma.Config in favor of Application

Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index d4bc8f63de26d59813b506e2ae10b45a9292f795..eedad767507a6b48adc88f9f6c81b0d6ca9cab66 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -10,7 +10,6 @@ defmodule Pleroma.Application do
     # Define workers and child supervisors to be supervised
     children =
       [
-        worker(Pleroma.Config, [Application.get_all_env(:pleroma)]),
         # Start the Ecto repository
         supervisor(Pleroma.Repo, []),
         worker(Pleroma.Emoji, []),

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
deleted file mode 100644 (file)
index 510d8d4..0000000
--- a/lib/pleroma/config.ex
+++ /dev/null
@@ -1,15 +0,0 @@
-defmodule Pleroma.Config do
-  use Agent
-
-  def start_link(initial) do
-    Agent.start_link(fn -> initial end, name: __MODULE__)
-  end
-
-  def get(path) do
-    Agent.get(__MODULE__, Kernel, :get_in, [path])
-  end
-
-  def put(path, value) do
-    Agent.update(__MODULE__, Kernel, :put_in, [path, value])
-  end
-end

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 531e98237a1abb537da41ffbdb0f9010e93ecea3..47937beef430a6437dc782394c1b86762fd0be25 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -6,7 +6,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   alias Pleroma.Web.ActivityPub.Relay
   alias Pleroma.Web.ActivityPub.Utils
   alias Pleroma.Web.Federator
-  alias Pleroma.Config
 
   require Logger
 
@@ -15,7 +14,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   plug(:relay_active? when action in [:relay])
 
   def relay_active?(conn, _) do
-    if Config.get([:instance, :allow_relay]) do
+    if Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay) do
       conn
     else
       conn

diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 9ea2507a1aacf4c495491b20dfc69ad8785ba17b..01c2c89c35285d5a27cabafeb105dd09a1ade45b 100644 (file)
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -7,7 +7,6 @@ defmodule Pleroma.Web.Federator do
   alias Pleroma.Web.ActivityPub.Relay
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.ActivityPub.Utils
-  alias Pleroma.Config
   require Logger
 
   @websub Application.get_env(:pleroma, :websub)
@@ -72,7 +71,7 @@ defmodule Pleroma.Web.Federator do
         Logger.info(fn -> "Sending #{activity.data["id"]} out via Salmon" end)
         Pleroma.Web.Salmon.publish(actor, activity)
 
-        if Config.get([:instance, :allow_relay]) do
+        if Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay) do
           Logger.info(fn -> "Relaying #{activity.data["id"]} out" end)
           Relay.publish(activity)
         end

diff --git a/test/config_test.exs b/test/config_test.exs
deleted file mode 100644 (file)
index 6d0f0a2..0000000
--- a/test/config_test.exs
+++ /dev/null
@@ -1,10 +0,0 @@
-defmodule Pleroma.ConfigTest do
-  use Pleroma.DataCase
-  alias Pleroma.Config
-
-  test "get returns the item at the path if there is one" do
-    Config.put([:instance, :name], "Plemora")
-    assert Config.get([:instance, :name]) == "Plemora"
-    assert Config.get([:unknown]) == nil
-  end
-end

diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index 5b46bbe768e6cdb2e188e6d06d26015615553e71..524ed9eaa0f606fcbb7e9f61c315c3beb0c7b88b 100644 (file)
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -4,12 +4,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
   alias Pleroma.Web.ActivityPub.{UserView, ObjectView}
   alias Pleroma.{Repo, User}
   alias Pleroma.Activity
-  alias Pleroma.Config
 
   describe "/relay" do
     test "with the relay active, it returns the relay user", %{conn: conn} do
-      Config.put([:instance, :allow_relay], true)
-
       res =
         conn
         |> get(activity_pub_path(conn, :relay))
@@ -19,12 +16,23 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
     end
 
     test "with the relay disabled, it returns 404", %{conn: conn} do
-      Config.put([:instance, :allow_relay], false)
+      instance =
+        Application.get_env(:pleroma, :instance)
+        |> Keyword.put(:allow_relay, false)
+
+      Application.put_env(:pleroma, :instance, instance)
 
       res =
         conn
         |> get(activity_pub_path(conn, :relay))
         |> json_response(404)
+
+      instance =
+        Application.get_env(:pleroma, :instance)
+        |> Keyword.put(:allow_relay, true)
+
+      Application.put_env(:pleroma, :instance, instance)
+
     end
   end
 

diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
index 966702935d9406f46dc2c2a41fb5517490a40d5c..88aef0d0f5f26a9a961233c76f70cf67c09d2a2b 100644 (file)
--- a/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.FederatorTest do
   alias Pleroma.Web.Federator
   alias Pleroma.Web.CommonAPI
-  alias Pleroma.Config
   use Pleroma.DataCase
   import Pleroma.Factory
   import Mock
@@ -40,8 +39,6 @@ defmodule Pleroma.Web.FederatorTest do
       activity: activity,
       relay_mock: relay_mock
     } do
-      Config.put([:instance, :allow_relay], true)
-
       with_mocks([relay_mock]) do
         Federator.handle(:publish, activity)
       end
@@ -53,13 +50,23 @@ defmodule Pleroma.Web.FederatorTest do
       activity: activity,
       relay_mock: relay_mock
     } do
-      Config.put([:instance, :allow_relay], false)
+      instance =
+        Application.get_env(:pleroma, :instance)
+        |> Keyword.put(:allow_relay, false)
+
+      Application.put_env(:pleroma, :instance, instance)
 
       with_mocks([relay_mock]) do
         Federator.handle(:publish, activity)
       end
 
       refute_received :relay_publish
+
+      instance =
+        Application.get_env(:pleroma, :instance)
+        |> Keyword.put(:allow_relay, true)
+
+      Application.put_env(:pleroma, :instance, instance)
     end
   end
 end