From 4bdfcf1682f1429e72102bf9f54ddee9e7ede0bc Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 16:20:28 -0600
Subject: [PATCH] Transform strings to atoms for all cases, including when the
 atom is a module like Pleroma.Emails.Mailer

---
 lib/mix/tasks/pleroma/config.ex | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 078a4110b..7ab15e60b 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -57,8 +57,8 @@ def run(["dump", group, key]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = atomize(group)
-      key = atomize(key)
+      group = maybe_atomize(group)
+      key = maybe_atomize(key)
 
       dump_key(group, key)
     else
@@ -70,7 +70,7 @@ def run(["dump", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = atomize(group)
+      group = maybe_atomize(group)
 
       dump_group(group)
     else
@@ -103,7 +103,7 @@ def run(["keys", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = atomize(group)
+      group = maybe_atomize(group)
 
       keys =
         ConfigDB
@@ -148,7 +148,7 @@ def run(["delete", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = atomize(group)
+      group = maybe_atomize(group)
 
       if group_exists?(group) do
         shell_info("The following settings will be removed from ConfigDB:\n")
@@ -178,8 +178,8 @@ def run(["delete", group, key]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = atomize(group)
-      key = atomize(key)
+      group = maybe_atomize(group)
+      key = maybe_atomize(key)
 
       if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
         ConfigDB
@@ -337,7 +337,7 @@ defp configdb_not_enabled do
     )
   end
 
-  defp dump_key(group, key) when is_atom(group) and is_atom(key) do
+  defp dump_key(group, key) when is_atom(group)  and is_atom(key) do
     ConfigDB
     |> Repo.all()
     |> Enum.filter(fn x ->
@@ -374,6 +374,15 @@ defp group_exists?(group) when is_atom(group) do
     end
   end
 
-  defp atomize(x) when is_atom(x), do: x
-  defp atomize(x) when is_binary(x), do: String.to_atom(x)
+  def maybe_atomize(arg) when is_atom(arg), do: arg
+
+  def maybe_atomize(arg) when is_binary(arg) do
+    chars = String.codepoints(arg)
+
+    if "." in chars do
+      :"Elixir.#{arg}"
+    else
+      String.to_atom(arg)
+    end
+  end
 end