From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 20:02:45 +0000 (-0600)
Subject: Fix deletion regression due to strings instead of atoms
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ae7d37de0665021373d9bc4d01d648c7d812eaed;p=akkoma

Fix deletion regression due to strings instead of atoms
Improve message after successful deletion
---

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a794344cb..e5536d16a 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -131,11 +131,34 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["delete" | args]) when is_list(args) and length(args) == 2 do
+  def run(["delete", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      [group, key] = args
+      group = group |> String.to_atom()
+
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        ConfigDB
+        |> Repo.all()
+        |> Enum.filter(fn x ->
+          if x.group == group do
+            x |> delete(true)
+          end
+        end)
+      else
+        shell_info("No changes made.")
+      end
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["delete", group, key]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      group = group |> String.to_atom()
+      key = key |> String.to_atom()
 
       if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
         ConfigDB
@@ -273,7 +296,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete(config, true) do
     {:ok, _} = Repo.delete(config)
-    shell_info("#{config.key} deleted from the ConfigDB.")
+    shell_info(":#{config.group}, :#{config.key} deleted from the ConfigDB.")
   end
 
   defp delete(_config, _), do: :ok