X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig.ex;h=3876ddf1f303573088f9c7059b86b258ece48f04;hb=89b3729afa130a62a47ed6372350ebfc5acb4064;hp=fc5338591d684b9da364644d99a33cfc84dc0155;hpb=a68c18f0ad6befe432e961bd348744b305492524;p=akkoma

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index fc5338591..3876ddf1f 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -1,13 +1,29 @@
 defmodule Pleroma.Config do
-  def get([key]), do: get(key)
+  defmodule Error do
+    defexception [:message]
+  end
+
+  def get(key), do: get(key, nil)
 
-  def get([parent_key | keys]) do
+  def get([key], default), do: get(key, default)
+
+  def get([parent_key | keys], default) do
     Application.get_env(:pleroma, parent_key)
-    |> get_in(keys)
+    |> get_in(keys) || default
   end
 
-  def get(key) do
-    Application.get_env(:pleroma, key)
+  def get(key, default) do
+    Application.get_env(:pleroma, key, default)
+  end
+
+  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)
@@ -23,4 +39,18 @@ defmodule Pleroma.Config do
   def put(key, value) do
     Application.put_env(:pleroma, key, value)
   end
+
+  def delete([key]), do: delete(key)
+
+  def delete([parent_key | keys]) do
+    {_, parent} =
+      Application.get_env(:pleroma, parent_key)
+      |> get_and_update_in(keys, fn _ -> :pop end)
+
+    Application.put_env(:pleroma, parent_key, parent)
+  end
+
+  def delete(key) do
+    Application.delete_env(:pleroma, key)
+  end
 end