1 files changed, 34 insertions, 7 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 510d8d498..15f771b6e 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -1,15 +1,42 @@
 defmodule Pleroma.Config do
-  use Agent
+  defmodule Error do
+    defexception [:message]
+  end
+
+  def get(key), do: get(key, nil)
+
+  def get([key], default), do: get(key, default)
+
+  def get([parent_key | keys], default) do
+    Application.get_env(:pleroma, parent_key)
+    |> get_in(keys) || default
+  end
 
-  def start_link(initial) do
-    Agent.start_link(fn -> initial end, name: __MODULE__)
+  def get(key, default) do
+    Application.get_env(:pleroma, key, default)
   end
 
-  def get(path) do
-    Agent.get(__MODULE__, Kernel, :get_in, [path])
+  def get!(key) do
+    value = get(key, nil)
+
+    if value == nil do
+      raise(Error, message: "Missing configuration value: #{inspect(key)}")
+    else
+      value
+    end
+  end
+
+  def put([key], value), do: put(key, value)
+
+  def put([parent_key | keys], value) do
+    parent =
+      Application.get_env(:pleroma, parent_key)
+      |> put_in(keys, value)
+
+    Application.put_env(:pleroma, parent_key, parent)
   end
 
-  def put(path, value) do
-    Agent.update(__MODULE__, Kernel, :put_in, [path, value])
+  def put(key, value) do
+    Application.put_env(:pleroma, key, value)
   end
 end