From 56e9bf33932bacfdffd700b97e3117fc593cac11 Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Tue, 4 Aug 2020 14:35:47 +0300
Subject: Unify Config.get behaviour for atom/list key param

---
 lib/pleroma/config.ex | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index cc80deff5..88d1972ba 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -11,13 +11,33 @@ defmodule Pleroma.Config do
 
   def get([key], default), do: get(key, default)
 
-  def get([parent_key | keys], default) do
-    case :pleroma
-         |> Application.get_env(parent_key)
-         |> get_in(keys) do
-      nil -> default
-      any -> any
-    end
+  def get([root_key | keys], default) do
+    # This is to mimic Application.get_env/3 behaviour that returns `nil` if the
+    # actual value is `nil`.
+    Enum.reduce_while(keys, Application.get_env(:pleroma, root_key), fn key, config ->
+      case key do
+        [last_key] when is_map(config) ->
+          {:halt, Map.get(config, last_key, default)}
+
+        [last_key] when is_list(config) ->
+          {:halt, Keyword.get(config, last_key, default)}
+
+        _ ->
+          case config do
+            %{^key => value} ->
+              {:cont, value}
+
+            [_ | _] ->
+              case :lists.keyfind(key, 1, config) do
+                {_, value} -> {:cont, value}
+                _ -> {:halt, default}
+              end
+
+            _ ->
+              {:halt, default}
+          end
+      end
+    end)
   end
 
   def get(key, default) do
-- 
cgit v1.2.3


From 6f60ac9f41d9511afa71986f000a2fc6c637b0c5 Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Wed, 5 Aug 2020 13:00:49 +0300
Subject: Refactor config

---
 lib/pleroma/config.ex | 61 ++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 88d1972ba..98099ca58 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -11,33 +11,11 @@ defmodule Pleroma.Config do
 
   def get([key], default), do: get(key, default)
 
-  def get([root_key | keys], default) do
-    # This is to mimic Application.get_env/3 behaviour that returns `nil` if the
-    # actual value is `nil`.
-    Enum.reduce_while(keys, Application.get_env(:pleroma, root_key), fn key, config ->
-      case key do
-        [last_key] when is_map(config) ->
-          {:halt, Map.get(config, last_key, default)}
-
-        [last_key] when is_list(config) ->
-          {:halt, Keyword.get(config, last_key, default)}
-
-        _ ->
-          case config do
-            %{^key => value} ->
-              {:cont, value}
-
-            [_ | _] ->
-              case :lists.keyfind(key, 1, config) do
-                {_, value} -> {:cont, value}
-                _ -> {:halt, default}
-              end
-
-            _ ->
-              {:halt, default}
-          end
-      end
-    end)
+  def get([_ | _] = path, default) do
+    case fetch(path) do
+      {:ok, value} -> value
+      :error -> default
+    end
   end
 
   def get(key, default) do
@@ -54,6 +32,22 @@ defmodule Pleroma.Config do
     end
   end
 
+  def fetch([root_key | keys]) do
+    Enum.reduce_while(keys, Application.fetch_env(:pleroma, root_key), fn
+      key, {:ok, config} when is_map(config) or is_list(config) ->
+        case Access.fetch(config, key) do
+          :error ->
+            {:halt, :error}
+
+          value ->
+            {:cont, value}
+        end
+
+      _key, _config ->
+        {:halt, :error}
+    end)
+  end
+
   def put([key], value), do: put(key, value)
 
   def put([parent_key | keys], value) do
@@ -70,12 +64,15 @@ defmodule Pleroma.Config do
 
   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)
+  def delete([parent_key | keys] = path) do
+    with {:ok, _} <- fetch(path) do
+      {_, parent} =
+        parent_key
+        |> get()
+        |> get_and_update_in(keys, fn _ -> :pop end)
 
-    Application.put_env(:pleroma, parent_key, parent)
+      Application.put_env(:pleroma, parent_key, parent)
+    end
   end
 
   def delete(key) do
-- 
cgit v1.2.3


From 8c57a299b463b7e5916addbbd3571b35e1742ebd Mon Sep 17 00:00:00 2001
From: Roman Chvanikov <chvanikoff@pm.me>
Date: Wed, 5 Aug 2020 18:23:12 +0300
Subject: Handle non-list keys in Config.fetch/1

---
 lib/pleroma/config.ex | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib')

diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
index 98099ca58..a8329cc1e 100644
--- a/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@ -32,6 +32,8 @@ defmodule Pleroma.Config do
     end
   end
 
+  def fetch(key) when is_atom(key), do: fetch([key])
+
   def fetch([root_key | keys]) do
     Enum.reduce_while(keys, Application.fetch_env(:pleroma, root_key), fn
       key, {:ok, config} when is_map(config) or is_list(config) ->
-- 
cgit v1.2.3