X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fmix%2Ftasks%2Fpleroma%2Fconfig.ex;h=d7e2e97e7dae02207b7dc0d4376bc9e6d81f123b;hb=18b536c176d3b51f3a91f42ba5a001711ab85490;hp=b5d80294875964080e80e1d1b01ad7108a9dc9cf;hpb=e00c66714590948ef917909779772155e20a3c96;p=akkoma

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index b5d802948..d7e2e97e7 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -134,7 +134,18 @@ defmodule Mix.Tasks.Pleroma.Config do
     group = maybe_atomize(group)
     key = maybe_atomize(key)
 
-    delete_key(group, key)
+    with true <- key_exists?(group, key) do
+      shell_info("The following settings will be removed from ConfigDB:\n")
+
+      group
+      |> ConfigDB.get_by_group_and_key(key)
+      |> dump()
+
+      delete_key(group, key)
+    else
+      _ ->
+        shell_error("No settings in ConfigDB for #{inspect(group)}, #{inspect(key)}. Aborting.")
+    end
   end
 
   def run(["delete", "--force", group]) do
@@ -157,10 +168,21 @@ defmodule Mix.Tasks.Pleroma.Config do
     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
-      delete_key(group, key)
+    with true <- key_exists?(group, key) do
+      shell_info("The following settings will be removed from ConfigDB:\n")
+
+      group
+      |> ConfigDB.get_by_group_and_key(key)
+      |> dump()
+
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        delete_key(group, key)
+      else
+        shell_error("No changes made.")
+      end
     else
-      shell_error("No changes made.")
+      _ ->
+        shell_error("No settings in ConfigDB for #{inspect(group)}, #{inspect(key)}. Aborting.")
     end
   end
 
@@ -315,8 +337,17 @@ defmodule Mix.Tasks.Pleroma.Config do
     |> Enum.any?()
   end
 
+  defp key_exists?(group, key) do
+    group
+    |> ConfigDB.get_by_group_and_key(key)
+    |> is_nil
+    |> Kernel.!()
+  end
+
   defp maybe_atomize(arg) when is_atom(arg), do: arg
 
+  defp maybe_atomize(":" <> arg), do: maybe_atomize(arg)
+
   defp maybe_atomize(arg) when is_binary(arg) do
     if ConfigDB.module_name?(arg) do
       String.to_existing_atom("Elixir." <> arg)