From dc38dc847207e4724265fbeb111d0a236b75f93f Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 13 Oct 2020 21:52:06 -0500
Subject: Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235

---
 lib/mix/tasks/pleroma/user.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index e06262804..c454f1d28 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -345,11 +345,11 @@ defmodule Mix.Tasks.Pleroma.User do
     end
   end
 
-  def run(["toggle_confirmed", nickname]) do
+  def run(["confirm", nickname]) do
     start_pleroma()
 
     with %User{} = user <- User.get_cached_by_nickname(nickname) do
-      {:ok, user} = User.toggle_confirmation(user)
+      {:ok, user} = User.confirm(user)
 
       message = if user.confirmation_pending, do: "needs", else: "doesn't need"
 
-- 
cgit v1.2.3


From 20e68b30f08e0e0eae691dcf541968e344efdaae Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Tue, 14 Jul 2020 07:31:21 +0300
Subject: added generated  `pleroma.env`

---
 lib/mix/tasks/pleroma/release_env.ex | 64 ++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 lib/mix/tasks/pleroma/release_env.ex

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
new file mode 100644
index 000000000..cbbbdeff6
--- /dev/null
+++ b/lib/mix/tasks/pleroma/release_env.ex
@@ -0,0 +1,64 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Mix.Tasks.Pleroma.ReleaseEnv do
+  use Mix.Task
+  import Mix.Pleroma
+
+  @shortdoc "Generate Pleroma environment file."
+  @moduledoc File.read!("docs/administration/CLI_tasks/release_environments.md")
+
+  def run(["gen" | rest]) do
+    {options, [], []} =
+      OptionParser.parse(
+        rest,
+        strict: [
+          force: :boolean,
+          path: :string
+        ],
+        aliases: [
+          p: :path,
+          f: :force
+        ]
+      )
+
+    env_path =
+      get_option(
+        options,
+        :path,
+        "Environment file path",
+        "config/pleroma.env"
+      )
+      |> Path.expand()
+
+    proceed? =
+      if File.exists?(env_path) do
+        get_option(
+          options,
+          :force,
+          "Environment file is exist. Do you want overwritten the #{env_path} file? (y/n)",
+          "n"
+        ) === "y"
+      else
+        true
+      end
+
+    if proceed? do
+      do_generate(env_path)
+
+      shell_info(
+        "The file generated: #{env_path}.\nTo use the enviroment file need to add the line ';EnvironmentFile=#{
+          env_path
+        }' in service file (/installation/pleroma.service)."
+      )
+    end
+  end
+
+  def do_generate(path) do
+    content = "RELEASE_COOKIE=#{Base.encode32(:crypto.strong_rand_bytes(32))}"
+
+    File.mkdir_p!(Path.dirname(path))
+    File.write!(path, content)
+  end
+end
-- 
cgit v1.2.3


From 14054cd004d91e89644c31d61b08d50ff0df09dd Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Thu, 16 Jul 2020 08:52:14 +0300
Subject: update task messages

---
 lib/mix/tasks/pleroma/release_env.ex | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
index cbbbdeff6..63030c5cc 100644
--- a/lib/mix/tasks/pleroma/release_env.ex
+++ b/lib/mix/tasks/pleroma/release_env.ex
@@ -23,14 +23,15 @@ defmodule Mix.Tasks.Pleroma.ReleaseEnv do
         ]
       )
 
-    env_path =
+    file_path =
       get_option(
         options,
         :path,
         "Environment file path",
-        "config/pleroma.env"
+        "./config/pleroma.env"
       )
-      |> Path.expand()
+
+    env_path = Path.expand(file_path)
 
     proceed? =
       if File.exists?(env_path) do
@@ -45,13 +46,24 @@ defmodule Mix.Tasks.Pleroma.ReleaseEnv do
       end
 
     if proceed? do
-      do_generate(env_path)
+      case do_generate(env_path) do
+        {:error, reason} ->
+          shell_error(
+            File.Error.message(%{action: "write to file", reason: reason, path: env_path})
+          )
 
-      shell_info(
-        "The file generated: #{env_path}.\nTo use the enviroment file need to add the line ';EnvironmentFile=#{
-          env_path
-        }' in service file (/installation/pleroma.service)."
-      )
+        _ ->
+          shell_info("\nThe file generated: #{env_path}.\n")
+
+          shell_info("""
+          WARNING: before start pleroma app please to made the file read-only and non-modifiable.
+            Example:
+              chmod 0444 #{file_path}
+              chattr +i #{file_path}
+          """)
+      end
+    else
+      shell_info("\nThe file is exist. #{env_path}.\n")
     end
   end
 
@@ -59,6 +71,6 @@ defmodule Mix.Tasks.Pleroma.ReleaseEnv do
     content = "RELEASE_COOKIE=#{Base.encode32(:crypto.strong_rand_bytes(32))}"
 
     File.mkdir_p!(Path.dirname(path))
-    File.write!(path, content)
+    File.write(path, content)
   end
 end
-- 
cgit v1.2.3


From 499df7b73aa723aab9c623754b531307b98cf584 Mon Sep 17 00:00:00 2001
From: Maksim <parallel588@gmail.com>
Date: Thu, 16 Jul 2020 13:30:17 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

---
 lib/mix/tasks/pleroma/release_env.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
index 63030c5cc..4d8b6ff27 100644
--- a/lib/mix/tasks/pleroma/release_env.ex
+++ b/lib/mix/tasks/pleroma/release_env.ex
@@ -56,7 +56,7 @@ defmodule Mix.Tasks.Pleroma.ReleaseEnv do
           shell_info("\nThe file generated: #{env_path}.\n")
 
           shell_info("""
-          WARNING: before start pleroma app please to made the file read-only and non-modifiable.
+          WARNING: before start pleroma app please make sure to make the file read-only and non-modifiable.
             Example:
               chmod 0444 #{file_path}
               chattr +i #{file_path}
-- 
cgit v1.2.3


From e2333f757a763f7ec7105df6b4de4585fc3eee05 Mon Sep 17 00:00:00 2001
From: Maksim <parallel588@gmail.com>
Date: Thu, 16 Jul 2020 13:30:28 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

---
 lib/mix/tasks/pleroma/release_env.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
index 4d8b6ff27..9da74ffcf 100644
--- a/lib/mix/tasks/pleroma/release_env.ex
+++ b/lib/mix/tasks/pleroma/release_env.ex
@@ -38,7 +38,7 @@ defmodule Mix.Tasks.Pleroma.ReleaseEnv do
         get_option(
           options,
           :force,
-          "Environment file is exist. Do you want overwritten the #{env_path} file? (y/n)",
+          "Environment file already exists. Do you want to overwrite the #{env_path} file? (y/n)",
           "n"
         ) === "y"
       else
-- 
cgit v1.2.3


From cf53e300f8e850aeacb88e6e6b4d465378acc199 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Fri, 7 Aug 2020 15:55:08 +0300
Subject: added generate the release env to `pleroma.instance gen`

---
 lib/mix/tasks/pleroma/instance.ex | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index fc21ae062..caa7dfbd3 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -36,7 +36,8 @@ defmodule Mix.Tasks.Pleroma.Instance do
           listen_port: :string,
           strip_uploads: :string,
           anonymize_uploads: :string,
-          dedupe_uploads: :string
+          dedupe_uploads: :string,
+          skip_release_env: :boolean
         ],
         aliases: [
           o: :output,
@@ -241,6 +242,16 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
       write_robots_txt(static_dir, indexable, template_dir)
 
+      if Keyword.get(options, :skip_release_env, false) do
+        shell_info("""
+        Release environment file is skip. Please generate the release env file before start.
+        `MIX_ENV=#{Mix.env()} mix pleroma.release_env gen`
+        """)
+      else
+        shell_info("Generation the environment file:")
+        Mix.Tasks.Pleroma.ReleaseEnv.run(["gen"])
+      end
+
       shell_info(
         "\n All files successfully written! Refer to the installation instructions for your platform for next steps."
       )
-- 
cgit v1.2.3


From 2030ffd4904b6ab5e99cefa62887154a49aaf4db Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sat, 8 Aug 2020 06:49:19 +0300
Subject: fix test

---
 lib/mix/tasks/pleroma/instance.ex | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index caa7dfbd3..1915aacd9 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -37,7 +37,8 @@ defmodule Mix.Tasks.Pleroma.Instance do
           strip_uploads: :string,
           anonymize_uploads: :string,
           dedupe_uploads: :string,
-          skip_release_env: :boolean
+          skip_release_env: :boolean,
+          release_env_file: :string
         ],
         aliases: [
           o: :output,
@@ -249,7 +250,15 @@ defmodule Mix.Tasks.Pleroma.Instance do
         """)
       else
         shell_info("Generation the environment file:")
-        Mix.Tasks.Pleroma.ReleaseEnv.run(["gen"])
+
+        release_env_args =
+          with path when not is_nil(path) <- Keyword.get(options, :release_env_file) do
+            ["gen", "--path", path]
+          else
+            _ -> ["gen"]
+          end
+
+        Mix.Tasks.Pleroma.ReleaseEnv.run(release_env_args)
       end
 
       shell_info(
-- 
cgit v1.2.3


From 03e306785b2013fe6fd47b59d4e578c6ed586b08 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 27 Oct 2020 19:20:04 +0400
Subject: Add an API endpoint to install a new frontend

---
 lib/mix/tasks/pleroma/frontend.ex | 107 +-------------------------------------
 1 file changed, 1 insertion(+), 106 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/frontend.ex b/lib/mix/tasks/pleroma/frontend.ex
index cbce81ab9..f15dbc38b 100644
--- a/lib/mix/tasks/pleroma/frontend.ex
+++ b/lib/mix/tasks/pleroma/frontend.ex
@@ -17,8 +17,6 @@ defmodule Mix.Tasks.Pleroma.Frontend do
   end
 
   def run(["install", frontend | args]) do
-    log_level = Logger.level()
-    Logger.configure(level: :warn)
     start_pleroma()
 
     {options, [], []} =
@@ -33,109 +31,6 @@ defmodule Mix.Tasks.Pleroma.Frontend do
         ]
       )
 
-    instance_static_dir =
-      with nil <- options[:static_dir] do
-        Pleroma.Config.get!([:instance, :static_dir])
-      end
-
-    cmd_frontend_info = %{
-      "name" => frontend,
-      "ref" => options[:ref],
-      "build_url" => options[:build_url],
-      "build_dir" => options[:build_dir]
-    }
-
-    config_frontend_info = Pleroma.Config.get([:frontends, :available, frontend], %{})
-
-    frontend_info =
-      Map.merge(config_frontend_info, cmd_frontend_info, fn _key, config, cmd ->
-        # This only overrides things that are actually set
-        cmd || config
-      end)
-
-    ref = frontend_info["ref"]
-
-    unless ref do
-      raise "No ref given or configured"
-    end
-
-    dest =
-      Path.join([
-        instance_static_dir,
-        "frontends",
-        frontend,
-        ref
-      ])
-
-    fe_label = "#{frontend} (#{ref})"
-
-    tmp_dir = Path.join([instance_static_dir, "frontends", "tmp"])
-
-    with {_, :ok} <-
-           {:download_or_unzip, download_or_unzip(frontend_info, tmp_dir, options[:file])},
-         shell_info("Installing #{fe_label} to #{dest}"),
-         :ok <- install_frontend(frontend_info, tmp_dir, dest) do
-      File.rm_rf!(tmp_dir)
-      shell_info("Frontend #{fe_label} installed to #{dest}")
-
-      Logger.configure(level: log_level)
-    else
-      {:download_or_unzip, _} ->
-        shell_info("Could not download or unzip the frontend")
-
-      _e ->
-        shell_info("Could not install the frontend")
-    end
-  end
-
-  defp download_or_unzip(frontend_info, temp_dir, file) do
-    if file do
-      with {:ok, zip} <- File.read(Path.expand(file)) do
-        unzip(zip, temp_dir)
-      end
-    else
-      download_build(frontend_info, temp_dir)
-    end
-  end
-
-  def unzip(zip, dest) do
-    with {:ok, unzipped} <- :zip.unzip(zip, [:memory]) do
-      File.rm_rf!(dest)
-      File.mkdir_p!(dest)
-
-      Enum.each(unzipped, fn {filename, data} ->
-        path = filename
-
-        new_file_path = Path.join(dest, path)
-
-        new_file_path
-        |> Path.dirname()
-        |> File.mkdir_p!()
-
-        File.write!(new_file_path, data)
-      end)
-
-      :ok
-    end
-  end
-
-  defp download_build(frontend_info, dest) do
-    shell_info("Downloading pre-built bundle for #{frontend_info["name"]}")
-    url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])
-
-    with {:ok, %{status: 200, body: zip_body}} <-
-           Pleroma.HTTP.get(url, [], pool: :media, recv_timeout: 120_000) do
-      unzip(zip_body, dest)
-    else
-      e -> {:error, e}
-    end
-  end
-
-  defp install_frontend(frontend_info, source, dest) do
-    from = frontend_info["build_dir"] || "dist"
-    File.rm_rf!(dest)
-    File.mkdir_p!(dest)
-    File.cp_r!(Path.join([source, from]), dest)
-    :ok
+    Pleroma.Frontend.install(frontend, options)
   end
 end
-- 
cgit v1.2.3


From cc45c69fff515cb82c4902b67c8edce6b109c819 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 7 Nov 2020 22:09:28 +0300
Subject: Remove release_env

While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
 docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
 though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
---
 lib/mix/tasks/pleroma/instance.ex    | 22 +----------
 lib/mix/tasks/pleroma/release_env.ex | 76 ------------------------------------
 2 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 lib/mix/tasks/pleroma/release_env.ex

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index 1915aacd9..fc21ae062 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -36,9 +36,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
           listen_port: :string,
           strip_uploads: :string,
           anonymize_uploads: :string,
-          dedupe_uploads: :string,
-          skip_release_env: :boolean,
-          release_env_file: :string
+          dedupe_uploads: :string
         ],
         aliases: [
           o: :output,
@@ -243,24 +241,6 @@ defmodule Mix.Tasks.Pleroma.Instance do
 
       write_robots_txt(static_dir, indexable, template_dir)
 
-      if Keyword.get(options, :skip_release_env, false) do
-        shell_info("""
-        Release environment file is skip. Please generate the release env file before start.
-        `MIX_ENV=#{Mix.env()} mix pleroma.release_env gen`
-        """)
-      else
-        shell_info("Generation the environment file:")
-
-        release_env_args =
-          with path when not is_nil(path) <- Keyword.get(options, :release_env_file) do
-            ["gen", "--path", path]
-          else
-            _ -> ["gen"]
-          end
-
-        Mix.Tasks.Pleroma.ReleaseEnv.run(release_env_args)
-      end
-
       shell_info(
         "\n All files successfully written! Refer to the installation instructions for your platform for next steps."
       )
diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
deleted file mode 100644
index 9da74ffcf..000000000
--- a/lib/mix/tasks/pleroma/release_env.ex
+++ /dev/null
@@ -1,76 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Mix.Tasks.Pleroma.ReleaseEnv do
-  use Mix.Task
-  import Mix.Pleroma
-
-  @shortdoc "Generate Pleroma environment file."
-  @moduledoc File.read!("docs/administration/CLI_tasks/release_environments.md")
-
-  def run(["gen" | rest]) do
-    {options, [], []} =
-      OptionParser.parse(
-        rest,
-        strict: [
-          force: :boolean,
-          path: :string
-        ],
-        aliases: [
-          p: :path,
-          f: :force
-        ]
-      )
-
-    file_path =
-      get_option(
-        options,
-        :path,
-        "Environment file path",
-        "./config/pleroma.env"
-      )
-
-    env_path = Path.expand(file_path)
-
-    proceed? =
-      if File.exists?(env_path) do
-        get_option(
-          options,
-          :force,
-          "Environment file already exists. Do you want to overwrite the #{env_path} file? (y/n)",
-          "n"
-        ) === "y"
-      else
-        true
-      end
-
-    if proceed? do
-      case do_generate(env_path) do
-        {:error, reason} ->
-          shell_error(
-            File.Error.message(%{action: "write to file", reason: reason, path: env_path})
-          )
-
-        _ ->
-          shell_info("\nThe file generated: #{env_path}.\n")
-
-          shell_info("""
-          WARNING: before start pleroma app please make sure to make the file read-only and non-modifiable.
-            Example:
-              chmod 0444 #{file_path}
-              chattr +i #{file_path}
-          """)
-      end
-    else
-      shell_info("\nThe file is exist. #{env_path}.\n")
-    end
-  end
-
-  def do_generate(path) do
-    content = "RELEASE_COOKIE=#{Base.encode32(:crypto.strong_rand_bytes(32))}"
-
-    File.mkdir_p!(Path.dirname(path))
-    File.write(path, content)
-  end
-end
-- 
cgit v1.2.3


From e2f573d68baa8b161b92459ffacf534054082422 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sat, 14 Nov 2020 22:27:13 +0100
Subject: pleroma.instance: Fix Exiftool module name

---
 lib/mix/tasks/pleroma/instance.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index fc21ae062..ac8688424 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -284,7 +284,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
   defp upload_filters(filters) when is_map(filters) do
     enabled_filters =
       if filters.strip do
-        [Pleroma.Upload.Filter.ExifTool]
+        [Pleroma.Upload.Filter.Exiftool]
       else
         []
       end
-- 
cgit v1.2.3


From 6dcc36baa9b19d18785d6f7ab8ceb7dd941c6180 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 25 Nov 2020 12:44:06 -0600
Subject: Add mix tasks to give additional recovery and debugging options

- pleroma.config dump: prints the entire config as it would be exported to the filesystem
- pleroma.config dump KEY: prints the configuration under a specific ConfigDB key in the database
- pleroma.config keylist: lists the available keys in ConfigDB
- pleroma.config keydel KEY: deletes ConfigDB entry stored under the key

This should prevent the need for users to manually execute SQL queries.
---
 lib/mix/tasks/pleroma/config.ex | 89 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 18f99318d..b49854528 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -30,6 +30,83 @@ defmodule Mix.Tasks.Pleroma.Config do
     migrate_from_db(opts)
   end
 
+  def run(["dump"]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      header = config_header()
+
+      shell_info("#{header}")
+
+      ConfigDB
+      |> Repo.all()
+      |> Enum.each(&dump(&1))
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["dump" | dbkey]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      dbkey = dbkey |> List.first() |> String.to_atom()
+
+      ConfigDB
+      |> Repo.all()
+      |> Enum.filter(fn x ->
+        if x.key == dbkey do
+          x |> dump
+        end
+      end)
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["keylist"]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      keys =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.map(fn x -> x.key end)
+
+      if length(keys) > 0 do
+        shell_info("The following configuration keys are set in ConfigDB:\r\n")
+        keys |> Enum.each(fn x -> shell_info("-  #{x}") end)
+        shell_info("\r\n")
+      end
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["keydel" | dbkey]) do
+    unless [] == dbkey do
+      with true <- Pleroma.Config.get([:configurable_from_database]) do
+        start_pleroma()
+
+        dbkey = dbkey |> List.first() |> String.to_atom()
+
+        ConfigDB
+        |> Repo.all()
+        |> Enum.filter(fn x ->
+          if x.key == dbkey do
+            x |> delete(true)
+          end
+        end)
+      else
+        _ -> configdb_not_enabled()
+      end
+    else
+      shell_error(
+        "You must provide a key to delete. Use the keylist command to get a list of valid keys."
+      )
+    end
+  end
+
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
     with true <- Pleroma.Config.get([:configurable_from_database]),
@@ -154,4 +231,16 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp delete(_config, _), do: :ok
+
+  defp dump(%Pleroma.ConfigDB{} = config) do
+    value = inspect(config.value, limit: :infinity)
+
+    shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
+  end
+
+  defp configdb_not_enabled do
+    shell_error(
+      "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
+    )
+  end
 end
-- 
cgit v1.2.3


From a82ba66662fdcdccf0de384b0f57dd20bef0fd9d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 25 Nov 2020 17:16:23 -0600
Subject: Better deletion message

---
 lib/mix/tasks/pleroma/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index b49854528..675dda0d0 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -227,7 +227,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete(config, true) do
     {:ok, _} = Repo.delete(config)
-    shell_info("#{config.key} deleted from DB.")
+    shell_info("#{config.key} deleted from the ConfigDB.")
   end
 
   defp delete(_config, _), do: :ok
-- 
cgit v1.2.3


From e8a4062d9dc042253adc05f2ab964bbd468ace12 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 25 Nov 2020 17:31:44 -0600
Subject: Document how to delete individual configuration groups and completely
 reset the config without SQL

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 675dda0d0..574f8f4be 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -83,6 +83,19 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
+  def run(["reset"]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+
+      shell_info("The ConfigDB settings have been removed from the database.")
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
   def run(["keydel" | dbkey]) do
     unless [] == dbkey do
       with true <- Pleroma.Config.get([:configurable_from_database]) do
-- 
cgit v1.2.3


From ada073f2511ae57eb22dc9e8a4220b2382b9f97c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 25 Nov 2020 17:49:36 -0600
Subject: Rename keys to groups

---
 lib/mix/tasks/pleroma/config.ex | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 574f8f4be..3c94f1f5f 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -64,7 +64,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["keylist"]) do
+  def run(["groups"]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
@@ -96,7 +96,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["keydel" | dbkey]) do
+  def run(["groupdel" | dbkey]) do
     unless [] == dbkey do
       with true <- Pleroma.Config.get([:configurable_from_database]) do
         start_pleroma()
@@ -115,7 +115,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       end
     else
       shell_error(
-        "You must provide a key to delete. Use the keylist command to get a list of valid keys."
+        "You must provide a group to delete. Use the groups command to get a list of valid configDB groups."
       )
     end
   end
-- 
cgit v1.2.3


From a51da3c1d8355de0747605608fc929f5fa345b3f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 12:32:53 -0600
Subject: Sort output by group

Not the best sorting, but better than nothing.
---
 lib/mix/tasks/pleroma/config.ex | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 3c94f1f5f..76753e13c 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -40,6 +40,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       ConfigDB
       |> Repo.all()
+      |> Enum.sort()
       |> Enum.each(&dump(&1))
     else
       _ -> configdb_not_enabled()
-- 
cgit v1.2.3


From 67437feafc048e56d023370266fe3762405f3199 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 12:33:55 -0600
Subject: Support listing groups, listing keys in a group, and dumping the
 config based on group or specific key in that group

---
 lib/mix/tasks/pleroma/config.ex | 75 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 63 insertions(+), 12 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 76753e13c..5c01b21f8 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -47,35 +47,61 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["dump" | dbkey]) do
+  def run(["dump" | args]) when is_list(args) and length(args) < 3 do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      dbkey = dbkey |> List.first() |> String.to_atom()
-
-      ConfigDB
-      |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.key == dbkey do
-          x |> dump
-        end
-      end)
+      if length(args) > 1 do
+        [group, key] = args
+        dump_key(group, key)
+      else
+        [group] = args
+        dump_group(group)
+      end
     else
       _ -> configdb_not_enabled()
     end
   end
 
   def run(["groups"]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      groups =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.map(fn x -> x.group end)
+        |> Enum.sort()
+        |> Enum.uniq()
+
+      if length(groups) > 0 do
+        shell_info("The following configuration groups are set in ConfigDB:\r\n")
+        groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
+        shell_info("\r\n")
+      end
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["keys" | group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
       keys =
         ConfigDB
         |> Repo.all()
-        |> Enum.map(fn x -> x.key end)
+        |> Enum.map(fn x ->
+          if x.group == group do
+            x.key
+          end
+        end)
+        |> Enum.sort()
+        |> Enum.uniq()
+        |> Enum.reject(fn x -> x == nil end)
 
       if length(keys) > 0 do
-        shell_info("The following configuration keys are set in ConfigDB:\r\n")
+        shell_info("The following configuration keys under :#{group} are set in ConfigDB:\r\n")
         keys |> Enum.each(fn x -> shell_info("-  #{x}") end)
         shell_info("\r\n")
       end
@@ -257,4 +283,29 @@ defmodule Mix.Tasks.Pleroma.Config do
       "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
     )
   end
+
+  defp dump_key(group, key) do
+    group = group |> String.to_atom()
+    key = key |> String.to_atom()
+
+    ConfigDB
+    |> Repo.all()
+    |> Enum.filter(fn x ->
+      if x.group == group && x.key == key do
+        x |> dump
+      end
+    end)
+  end
+
+  defp dump_group(group) do
+    group = group |> String.to_atom()
+
+    ConfigDB
+    |> Repo.all()
+    |> Enum.filter(fn x ->
+      if x.group == group do
+        x |> dump
+      end
+    end)
+  end
 end
-- 
cgit v1.2.3


From c6a0ca2213be0eac1233ae28c11e563109771c85 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 13:55:43 -0600
Subject: Improve dumping groups and specific keys; add prompts for delete and
 reset

---
 lib/mix/tasks/pleroma/config.ex | 48 +++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 21 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 5c01b21f8..a794344cb 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -47,17 +47,21 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["dump" | args]) when is_list(args) and length(args) < 3 do
+  def run(["dump", group, key]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      if length(args) > 1 do
-        [group, key] = args
-        dump_key(group, key)
-      else
-        [group] = args
-        dump_group(group)
-      end
+      dump_key(group, key)
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
+
+  def run(["dump", group]) do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
+
+      dump_group(group)
     else
       _ -> configdb_not_enabled()
     end
@@ -114,36 +118,38 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
 
-      shell_info("The ConfigDB settings have been removed from the database.")
+        shell_info("The ConfigDB settings have been removed from the database.")
+      else
+        shell_info("No changes made.")
+      end
     else
       _ -> configdb_not_enabled()
     end
   end
 
-  def run(["groupdel" | dbkey]) do
-    unless [] == dbkey do
-      with true <- Pleroma.Config.get([:configurable_from_database]) do
-        start_pleroma()
+  def run(["delete" | args]) when is_list(args) and length(args) == 2 do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      start_pleroma()
 
-        dbkey = dbkey |> List.first() |> String.to_atom()
+      [group, key] = args
 
+      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.key == dbkey do
+          if x.group == group and x.key == key do
             x |> delete(true)
           end
         end)
       else
-        _ -> configdb_not_enabled()
+        shell_info("No changes made.")
       end
     else
-      shell_error(
-        "You must provide a group to delete. Use the groups command to get a list of valid configDB groups."
-      )
+      _ -> configdb_not_enabled()
     end
   end
 
-- 
cgit v1.2.3


From ae7d37de0665021373d9bc4d01d648c7d812eaed Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 14:02:45 -0600
Subject: Fix deletion regression due to strings instead of atoms Improve
 message after successful deletion

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

(limited to 'lib/mix/tasks')

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
-- 
cgit v1.2.3


From 3df115b2b0ee9f5ca6f2507550d18002379eeaa8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 14:44:05 -0600
Subject: Support atoms and strings as args to the mix task

Improve output. Show the user what will be deleted before the prompt.
---
 lib/mix/tasks/pleroma/config.ex | 95 +++++++++++++++++++++++++++++------------
 1 file changed, 67 insertions(+), 28 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index e5536d16a..078a4110b 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -36,12 +36,18 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       header = config_header()
 
-      shell_info("#{header}")
+      settings =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.sort()
 
-      ConfigDB
-      |> Repo.all()
-      |> Enum.sort()
-      |> Enum.each(&dump(&1))
+      unless settings == [] do
+        shell_info("#{header}")
+
+        settings |> Enum.each(&dump(&1))
+      else
+        shell_error("No settings in ConfigDB.")
+      end
     else
       _ -> configdb_not_enabled()
     end
@@ -51,6 +57,9 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      group = atomize(group)
+      key = atomize(key)
+
       dump_key(group, key)
     else
       _ -> configdb_not_enabled()
@@ -61,6 +70,8 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      group = atomize(group)
+
       dump_group(group)
     else
       _ -> configdb_not_enabled()
@@ -88,10 +99,12 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["keys" | group]) do
+  def run(["keys", group]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      group = atomize(group)
+
       keys =
         ConfigDB
         |> Repo.all()
@@ -124,7 +137,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
         shell_info("The ConfigDB settings have been removed from the database.")
       else
-        shell_info("No changes made.")
+        shell_error("No changes made.")
       end
     else
       _ -> configdb_not_enabled()
@@ -135,18 +148,26 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = group |> String.to_atom()
+      group = atomize(group)
 
-      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)
+      if group_exists?(group) do
+        shell_info("The following settings will be removed from ConfigDB:\n")
+
+        dump_group(group)
+
+        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_error("No changes made.")
+        end
       else
-        shell_info("No changes made.")
+        shell_error("No settings in ConfigDB for :#{group}. Aborting.")
       end
     else
       _ -> configdb_not_enabled()
@@ -157,8 +178,8 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
-      group = group |> String.to_atom()
-      key = key |> String.to_atom()
+      group = atomize(group)
+      key = atomize(key)
 
       if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
         ConfigDB
@@ -169,7 +190,7 @@ defmodule Mix.Tasks.Pleroma.Config do
           end
         end)
       else
-        shell_info("No changes made.")
+        shell_error("No changes made.")
       end
     else
       _ -> configdb_not_enabled()
@@ -296,7 +317,10 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete(config, true) do
     {:ok, _} = Repo.delete(config)
-    shell_info(":#{config.group}, :#{config.key} deleted from the ConfigDB.")
+
+    shell_info(
+      "config #{inspect(config.group)}, #{inspect(config.key)} deleted from the ConfigDB."
+    )
   end
 
   defp delete(_config, _), do: :ok
@@ -313,10 +337,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     )
   end
 
-  defp dump_key(group, key) do
-    group = group |> String.to_atom()
-    key = key |> String.to_atom()
-
+  defp dump_key(group, key) when is_atom(group) and is_atom(key) do
     ConfigDB
     |> Repo.all()
     |> Enum.filter(fn x ->
@@ -326,9 +347,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  defp dump_group(group) do
-    group = group |> String.to_atom()
-
+  defp dump_group(group) when is_atom(group) do
     ConfigDB
     |> Repo.all()
     |> Enum.filter(fn x ->
@@ -337,4 +356,24 @@ defmodule Mix.Tasks.Pleroma.Config do
       end
     end)
   end
+
+  defp group_exists?(group) when is_atom(group) do
+    result =
+      ConfigDB
+      |> Repo.all()
+      |> Enum.filter(fn x ->
+        if x.group == group do
+          x
+        end
+      end)
+
+    unless result == [] do
+      true
+    else
+      false
+    end
+  end
+
+  defp atomize(x) when is_atom(x), do: x
+  defp atomize(x) when is_binary(x), do: String.to_atom(x)
 end
-- 
cgit v1.2.3


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: 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(-)

(limited to 'lib/mix/tasks')

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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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 @@ defmodule Mix.Tasks.Pleroma.Config 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
-- 
cgit v1.2.3


From d4320e0daf7c732ba2c791cae697dea27c4919d2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 16:32:32 -0600
Subject: Both are really atoms

---
 lib/mix/tasks/pleroma/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 7ab15e60b..a7c307f77 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -337,7 +337,7 @@ defmodule Mix.Tasks.Pleroma.Config 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 ->
-- 
cgit v1.2.3


From 0847e3e496624a97c7eb933cf69a92fd84677ce0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 16:32:46 -0600
Subject: Print whole config when resetting and include a scary looking
 message.

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a7c307f77..0c8170c9c 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -131,6 +131,15 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
 
+      shell_info("The following settings will be permanently removed:")
+
+      ConfigDB
+      |> Repo.all()
+      |> Enum.sort()
+      |> Enum.each(&dump(&1))
+
+      shell_error("THIS CANNOT BE UNDONE!")
+
       if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
         Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
         Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
-- 
cgit v1.2.3


From d0cb73527f1bc21aa6bb6d21bfcdf58c406c5b0c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sat, 28 Nov 2020 12:05:01 -0600
Subject: Ensure scary warning starts on a new line

---
 lib/mix/tasks/pleroma/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 0c8170c9c..fe0cd81f8 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -138,7 +138,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       |> Enum.sort()
       |> Enum.each(&dump(&1))
 
-      shell_error("THIS CANNOT BE UNDONE!")
+      shell_error("\nTHIS CANNOT BE UNDONE!")
 
       if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
         Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-- 
cgit v1.2.3


From 6334ba9ad3d275e9e50b30319e2dbed3aac35fac Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sat, 28 Nov 2020 12:22:30 -0600
Subject: Remove unnecessary keys command

---
 lib/mix/tasks/pleroma/config.ex | 28 ----------------------------
 1 file changed, 28 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index fe0cd81f8..f657adf46 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -99,34 +99,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def run(["keys", group]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
-
-      group = maybe_atomize(group)
-
-      keys =
-        ConfigDB
-        |> Repo.all()
-        |> Enum.map(fn x ->
-          if x.group == group do
-            x.key
-          end
-        end)
-        |> Enum.sort()
-        |> Enum.uniq()
-        |> Enum.reject(fn x -> x == nil end)
-
-      if length(keys) > 0 do
-        shell_info("The following configuration keys under :#{group} are set in ConfigDB:\r\n")
-        keys |> Enum.each(fn x -> shell_info("-  #{x}") end)
-        shell_info("\r\n")
-      end
-    else
-      _ -> configdb_not_enabled()
-    end
-  end
-
   def run(["reset"]) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       start_pleroma()
-- 
cgit v1.2.3


From 5135a8189f9e297354a1d9f61f3cb7454711923c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sat, 28 Nov 2020 12:24:37 -0600
Subject: Use inspect instead of faking the output

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index f657adf46..3e1449550 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -148,7 +148,7 @@ defmodule Mix.Tasks.Pleroma.Config do
           shell_error("No changes made.")
         end
       else
-        shell_error("No settings in ConfigDB for :#{group}. Aborting.")
+        shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
       end
     else
       _ -> configdb_not_enabled()
@@ -228,7 +228,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       shell_info("Settings for key #{key} migrated.")
     end)
 
-    shell_info("Settings for group :#{group} migrated.")
+    shell_info("Settings for group #{inspect(group)} migrated.")
   end
 
   defp migrate_from_db(opts) do
-- 
cgit v1.2.3


From 53a5ec195239b399c2bc072f754346eba3b3b6b2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 29 Nov 2020 12:59:03 -0600
Subject: Left public during debugging

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 3e1449550..a781f3bf1 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -355,9 +355,9 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  def maybe_atomize(arg) when is_atom(arg), do: arg
+  defp maybe_atomize(arg) when is_atom(arg), do: arg
 
-  def maybe_atomize(arg) when is_binary(arg) do
+  defp maybe_atomize(arg) when is_binary(arg) do
     chars = String.codepoints(arg)
 
     if "." in chars do
-- 
cgit v1.2.3


From a7b5280b5b620e3548bbd387752a04c918418f61 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 29 Nov 2020 13:29:36 -0600
Subject: Centralize check that configdb is enabled which now raises an
 exception

---
 lib/mix/tasks/pleroma/config.ex | 235 ++++++++++++++++++----------------------
 1 file changed, 106 insertions(+), 129 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a781f3bf1..df4ee55c1 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -14,11 +14,13 @@ defmodule Mix.Tasks.Pleroma.Config do
   @moduledoc File.read!("docs/administration/CLI_tasks/config.md")
 
   def run(["migrate_to_db"]) do
+    check_configdb()
     start_pleroma()
     migrate_to_db()
   end
 
   def run(["migrate_from_db" | options]) do
+    check_configdb()
     start_pleroma()
 
     {opts, _} =
@@ -31,142 +33,101 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   def run(["dump"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    check_configdb()
+    start_pleroma()
 
-      header = config_header()
+    header = config_header()
 
-      settings =
-        ConfigDB
-        |> Repo.all()
-        |> Enum.sort()
+    settings =
+      ConfigDB
+      |> Repo.all()
+      |> Enum.sort()
 
-      unless settings == [] do
-        shell_info("#{header}")
+    unless settings == [] do
+      shell_info("#{header}")
 
-        settings |> Enum.each(&dump(&1))
-      else
-        shell_error("No settings in ConfigDB.")
-      end
+      settings |> Enum.each(&dump(&1))
     else
-      _ -> configdb_not_enabled()
+      shell_error("No settings in ConfigDB.")
     end
   end
 
   def run(["dump", group, key]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    check_configdb()
+    start_pleroma()
 
-      group = maybe_atomize(group)
-      key = maybe_atomize(key)
+    group = maybe_atomize(group)
+    key = maybe_atomize(key)
 
-      dump_key(group, key)
-    else
-      _ -> configdb_not_enabled()
-    end
+    dump_key(group, key)
   end
 
   def run(["dump", group]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    check_configdb()
+    start_pleroma()
 
-      group = maybe_atomize(group)
+    group = maybe_atomize(group)
 
-      dump_group(group)
-    else
-      _ -> configdb_not_enabled()
-    end
+    dump_group(group)
   end
 
   def run(["groups"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    check_configdb()
+    start_pleroma()
 
-      groups =
-        ConfigDB
-        |> Repo.all()
-        |> Enum.map(fn x -> x.group end)
-        |> Enum.sort()
-        |> Enum.uniq()
-
-      if length(groups) > 0 do
-        shell_info("The following configuration groups are set in ConfigDB:\r\n")
-        groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
-        shell_info("\r\n")
-      end
-    else
-      _ -> configdb_not_enabled()
+    groups =
+      ConfigDB
+      |> Repo.all()
+      |> Enum.map(fn x -> x.group end)
+      |> Enum.sort()
+      |> Enum.uniq()
+
+    if length(groups) > 0 do
+      shell_info("The following configuration groups are set in ConfigDB:\r\n")
+      groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
+      shell_info("\r\n")
     end
   end
 
   def run(["reset"]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    check_configdb()
+    start_pleroma()
 
-      shell_info("The following settings will be permanently removed:")
+    shell_info("The following settings will be permanently removed:")
 
-      ConfigDB
-      |> Repo.all()
-      |> Enum.sort()
-      |> Enum.each(&dump(&1))
+    ConfigDB
+    |> Repo.all()
+    |> Enum.sort()
+    |> Enum.each(&dump(&1))
 
-      shell_error("\nTHIS CANNOT BE UNDONE!")
+    shell_error("\nTHIS CANNOT BE UNDONE!")
 
-      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+    if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
 
-        shell_info("The ConfigDB settings have been removed from the database.")
-      else
-        shell_error("No changes made.")
-      end
+      shell_info("The ConfigDB settings have been removed from the database.")
     else
-      _ -> configdb_not_enabled()
+      shell_error("No changes made.")
     end
   end
 
   def run(["delete", group]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
-
-      group = maybe_atomize(group)
-
-      if group_exists?(group) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-
-        dump_group(group)
+    check_configdb()
+    start_pleroma()
 
-        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_error("No changes made.")
-        end
-      else
-        shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
-      end
-    else
-      _ -> configdb_not_enabled()
-    end
-  end
+    group = maybe_atomize(group)
 
-  def run(["delete", group, key]) do
-    with true <- Pleroma.Config.get([:configurable_from_database]) do
-      start_pleroma()
+    if group_exists?(group) do
+      shell_info("The following settings will be removed from ConfigDB:\n")
 
-      group = maybe_atomize(group)
-      key = maybe_atomize(key)
+      dump_group(group)
 
       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 and x.key == key do
+          if x.group == group do
             x |> delete(true)
           end
         end)
@@ -174,14 +135,33 @@ defmodule Mix.Tasks.Pleroma.Config do
         shell_error("No changes made.")
       end
     else
-      _ -> configdb_not_enabled()
+      shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
+    end
+  end
+
+  def run(["delete", group, key]) do
+    check_configdb()
+    start_pleroma()
+
+    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
+      |> Repo.all()
+      |> Enum.filter(fn x ->
+        if x.group == group and x.key == key do
+          x |> delete(true)
+        end
+      end)
+    else
+      shell_error("No changes made.")
     end
   end
 
   @spec migrate_to_db(Path.t() | nil) :: any()
   def migrate_to_db(file_path \\ nil) do
-    with true <- Pleroma.Config.get([:configurable_from_database]),
-         :ok <- Pleroma.Config.DeprecationWarnings.warn() do
+    with :ok <- Pleroma.Config.DeprecationWarnings.warn() do
       config_file =
         if file_path do
           file_path
@@ -195,8 +175,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       do_migrate_to_db(config_file)
     else
-      :error -> deprecation_error()
-      _ -> migration_error()
+      _ -> deprecation_error()
     end
   end
 
@@ -232,41 +211,31 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp migrate_from_db(opts) do
-    if Pleroma.Config.get([:configurable_from_database]) do
-      env = opts[:env] || Pleroma.Config.get(:env)
-
-      config_path =
-        if Pleroma.Config.get(:release) do
-          :config_path
-          |> Pleroma.Config.get()
-          |> Path.dirname()
-        else
-          "config"
-        end
-        |> Path.join("#{env}.exported_from_db.secret.exs")
+    env = opts[:env] || Pleroma.Config.get(:env)
 
-      file = File.open!(config_path, [:write, :utf8])
+    config_path =
+      if Pleroma.Config.get(:release) do
+        :config_path
+        |> Pleroma.Config.get()
+        |> Path.dirname()
+      else
+        "config"
+      end
+      |> Path.join("#{env}.exported_from_db.secret.exs")
 
-      IO.write(file, config_header())
+    file = File.open!(config_path, [:write, :utf8])
 
-      ConfigDB
-      |> Repo.all()
-      |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
+    IO.write(file, config_header())
 
-      :ok = File.close(file)
-      System.cmd("mix", ["format", config_path])
+    ConfigDB
+    |> Repo.all()
+    |> Enum.each(&write_and_delete(&1, file, opts[:delete]))
 
-      shell_info(
-        "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
-      )
-    else
-      migration_error()
-    end
-  end
+    :ok = File.close(file)
+    System.cmd("mix", ["format", config_path])
 
-  defp migration_error do
-    shell_error(
-      "Migration is not allowed in config. You can change this behavior by setting `config :pleroma, configurable_from_database: true`"
+    shell_info(
+      "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
     )
   end
 
@@ -313,7 +282,7 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp configdb_not_enabled do
-    shell_error(
+    raise(
       "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
     )
   end
@@ -366,4 +335,12 @@ defmodule Mix.Tasks.Pleroma.Config do
       String.to_atom(arg)
     end
   end
+
+  defp check_configdb() do
+    with true <- Pleroma.Config.get([:configurable_from_database]) do
+      :ok
+    else
+      _ -> configdb_not_enabled()
+    end
+  end
 end
-- 
cgit v1.2.3


From 13947999ad28eac6668a601bf957d2e64edda9d3 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 2 Dec 2020 12:33:34 -0600
Subject: Use a callback strategy to short circuit the functions and print a
 nice error

---
 lib/mix/tasks/pleroma/config.ex | 199 +++++++++++++++++++++-------------------
 1 file changed, 104 insertions(+), 95 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index df4ee55c1..d509f150e 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -14,149 +14,158 @@ defmodule Mix.Tasks.Pleroma.Config do
   @moduledoc File.read!("docs/administration/CLI_tasks/config.md")
 
   def run(["migrate_to_db"]) do
-    check_configdb()
-    start_pleroma()
-    migrate_to_db()
+    check_configdb(fn ->
+      start_pleroma()
+      migrate_to_db()
+    end)
   end
 
   def run(["migrate_from_db" | options]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    {opts, _} =
-      OptionParser.parse!(options,
-        strict: [env: :string, delete: :boolean],
-        aliases: [d: :delete]
-      )
+      {opts, _} =
+        OptionParser.parse!(options,
+          strict: [env: :string, delete: :boolean],
+          aliases: [d: :delete]
+        )
 
-    migrate_from_db(opts)
+      migrate_from_db(opts)
+    end)
   end
 
   def run(["dump"]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    header = config_header()
+      header = config_header()
 
-    settings =
-      ConfigDB
-      |> Repo.all()
-      |> Enum.sort()
+      settings =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.sort()
 
-    unless settings == [] do
-      shell_info("#{header}")
+      unless settings == [] do
+        shell_info("#{header}")
 
-      settings |> Enum.each(&dump(&1))
-    else
-      shell_error("No settings in ConfigDB.")
-    end
+        settings |> Enum.each(&dump(&1))
+      else
+        shell_error("No settings in ConfigDB.")
+      end
+    end)
   end
 
   def run(["dump", group, key]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    group = maybe_atomize(group)
-    key = maybe_atomize(key)
+      group = maybe_atomize(group)
+      key = maybe_atomize(key)
 
-    dump_key(group, key)
+      dump_key(group, key)
+    end)
   end
 
   def run(["dump", group]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    group = maybe_atomize(group)
+      group = maybe_atomize(group)
 
-    dump_group(group)
+      dump_group(group)
+    end)
   end
 
   def run(["groups"]) do
-    check_configdb()
-    start_pleroma()
-
-    groups =
-      ConfigDB
-      |> Repo.all()
-      |> Enum.map(fn x -> x.group end)
-      |> Enum.sort()
-      |> Enum.uniq()
+    check_configdb(fn ->
+      start_pleroma()
 
-    if length(groups) > 0 do
-      shell_info("The following configuration groups are set in ConfigDB:\r\n")
-      groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
-      shell_info("\r\n")
-    end
+      groups =
+        ConfigDB
+        |> Repo.all()
+        |> Enum.map(fn x -> x.group end)
+        |> Enum.sort()
+        |> Enum.uniq()
+
+      if length(groups) > 0 do
+        shell_info("The following configuration groups are set in ConfigDB:\r\n")
+        groups |> Enum.each(fn x -> shell_info("-  #{x}") end)
+        shell_info("\r\n")
+      end
+    end)
   end
 
   def run(["reset"]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    shell_info("The following settings will be permanently removed:")
+      shell_info("The following settings will be permanently removed:")
 
-    ConfigDB
-    |> Repo.all()
-    |> Enum.sort()
-    |> Enum.each(&dump(&1))
+      ConfigDB
+      |> Repo.all()
+      |> Enum.sort()
+      |> Enum.each(&dump(&1))
 
-    shell_error("\nTHIS CANNOT BE UNDONE!")
+      shell_error("\nTHIS CANNOT BE UNDONE!")
 
-    if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
 
-      shell_info("The ConfigDB settings have been removed from the database.")
-    else
-      shell_error("No changes made.")
-    end
+        shell_info("The ConfigDB settings have been removed from the database.")
+      else
+        shell_error("No changes made.")
+      end
+    end)
   end
 
   def run(["delete", group]) do
-    check_configdb()
-    start_pleroma()
+    check_configdb(fn ->
+      start_pleroma()
 
-    group = maybe_atomize(group)
+      group = maybe_atomize(group)
 
-    if group_exists?(group) do
-      shell_info("The following settings will be removed from ConfigDB:\n")
+      if group_exists?(group) do
+        shell_info("The following settings will be removed from ConfigDB:\n")
 
-      dump_group(group)
+        dump_group(group)
+
+        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_error("No changes made.")
+        end
+      else
+        shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
+      end
+    end)
+  end
+
+  def run(["delete", group, key]) do
+    check_configdb(fn ->
+      start_pleroma()
+
+      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
         |> Repo.all()
         |> Enum.filter(fn x ->
-          if x.group == group do
+          if x.group == group and x.key == key do
             x |> delete(true)
           end
         end)
       else
         shell_error("No changes made.")
       end
-    else
-      shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
-    end
-  end
-
-  def run(["delete", group, key]) do
-    check_configdb()
-    start_pleroma()
-
-    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
-      |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.group == group and x.key == key do
-          x |> delete(true)
-        end
-      end)
-    else
-      shell_error("No changes made.")
-    end
+    end)
   end
 
   @spec migrate_to_db(Path.t() | nil) :: any()
@@ -282,7 +291,7 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp configdb_not_enabled do
-    raise(
+    shell_error(
       "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
     )
   end
@@ -336,9 +345,9 @@ defmodule Mix.Tasks.Pleroma.Config do
     end
   end
 
-  defp check_configdb() do
+  defp check_configdb(callback) do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
-      :ok
+      callback.()
     else
       _ -> configdb_not_enabled()
     end
-- 
cgit v1.2.3


From 25fab7da69e2a6019598132e5d776d7cebe42045 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 2 Dec 2020 13:00:07 -0600
Subject: No need for a separate functions here

---
 lib/mix/tasks/pleroma/config.ex | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index d509f150e..e53e21a0b 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -184,7 +184,8 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       do_migrate_to_db(config_file)
     else
-      _ -> deprecation_error()
+      _ ->
+        shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
     end
   end
 
@@ -248,10 +249,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     )
   end
 
-  defp deprecation_error do
-    shell_error("Migration is not allowed until all deprecation warnings have been resolved.")
-  end
-
   if Code.ensure_loaded?(Config.Reader) do
     defp config_header, do: "import Config\r\n\r\n"
     defp read_file(config_file), do: Config.Reader.read_imports!(config_file)
@@ -290,12 +287,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
   end
 
-  defp configdb_not_enabled do
-    shell_error(
-      "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
-    )
-  end
-
   defp dump_key(group, key) when is_atom(group) and is_atom(key) do
     ConfigDB
     |> Repo.all()
@@ -349,7 +340,10 @@ defmodule Mix.Tasks.Pleroma.Config do
     with true <- Pleroma.Config.get([:configurable_from_database]) do
       callback.()
     else
-      _ -> configdb_not_enabled()
+      _ ->
+        shell_error(
+          "ConfigDB not enabled. Please check the value of :configurable_from_database in your configuration."
+        )
     end
   end
 end
-- 
cgit v1.2.3


From 20a911f9f725088e841f2ebce220b26b1b4fe222 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 2 Dec 2020 14:22:59 -0600
Subject: Add comment for this mysterious behavior

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index e53e21a0b..e2c4cc680 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -329,6 +329,8 @@ defmodule Mix.Tasks.Pleroma.Config do
   defp maybe_atomize(arg) when is_binary(arg) do
     chars = String.codepoints(arg)
 
+    # hack to make sure input like Pleroma.Mailer.Foo is formatted correctly
+    # for matching against values returned by Ecto
     if "." in chars do
       :"Elixir.#{arg}"
     else
-- 
cgit v1.2.3


From e379ab8277f552d66737963a9c908ae3fc01c1ff Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 2 Dec 2020 16:24:32 -0600
Subject: Add --force flag for delete and reset commands

Bunch of reorganization and consolidation
---
 lib/mix/tasks/pleroma/config.ex | 110 +++++++++++++++++++++++++---------------
 1 file changed, 69 insertions(+), 41 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index e2c4cc680..014782c35 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -95,7 +95,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  def run(["reset"]) do
+  def run(["reset" | options]) do
     check_configdb(fn ->
       start_pleroma()
 
@@ -108,7 +108,11 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       shell_error("\nTHIS CANNOT BE UNDONE!")
 
-      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      proceed? =
+        "--force" in options or
+          shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y)
+
+      if proceed? do
         Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
         Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
 
@@ -119,53 +123,46 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  def run(["delete", group]) do
-    check_configdb(fn ->
-      start_pleroma()
+  def run(["delete", "--force", group, key]) do
+    start_pleroma()
 
-      group = maybe_atomize(group)
+    group = maybe_atomize(group)
+    key = maybe_atomize(key)
 
-      if group_exists?(group) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
+    delete_key(group, key)
+  end
 
-        dump_group(group)
+  def run(["delete", "--force", group]) do
+    start_pleroma()
 
-        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_error("No changes made.")
-        end
-      else
-        shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
-      end
-    end)
+    group = maybe_atomize(group)
+
+    delete_group(group)
   end
 
   def run(["delete", group, key]) do
-    check_configdb(fn ->
-      start_pleroma()
+    start_pleroma()
 
-      group = maybe_atomize(group)
-      key = maybe_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
-        |> Repo.all()
-        |> Enum.filter(fn x ->
-          if x.group == group and x.key == key do
-            x |> delete(true)
-          end
-        end)
-      else
-        shell_error("No changes made.")
-      end
-    end)
+    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
+  end
+
+  def run(["delete", group]) do
+    start_pleroma()
+
+    group = maybe_atomize(group)
+
+    if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+      delete_group(group)
+    else
+      shell_error("No changes made.")
+    end
   end
 
   @spec migrate_to_db(Path.t() | nil) :: any()
@@ -275,7 +272,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     {:ok, _} = Repo.delete(config)
 
     shell_info(
-      "config #{inspect(config.group)}, #{inspect(config.key)} deleted from the ConfigDB."
+      "config #{inspect(config.group)}, #{inspect(config.key)} was deleted from the ConfigDB."
     )
   end
 
@@ -348,4 +345,35 @@ defmodule Mix.Tasks.Pleroma.Config do
         )
     end
   end
+
+  defp delete_key(group, key) do
+    check_configdb(fn ->
+      ConfigDB
+      |> Repo.all()
+      |> Enum.filter(fn x ->
+        if x.group == group and x.key == key do
+          x |> delete(true)
+        end
+      end)
+    end)
+  end
+
+  defp delete_group(group) do
+    check_configdb(fn ->
+      with true <- group_exists?(group) do
+        shell_info("The following settings will be removed from ConfigDB:\n")
+        dump_group(group)
+
+        ConfigDB
+        |> Repo.all()
+        |> Enum.filter(fn x ->
+          if x.group == group do
+            x |> delete(true)
+          end
+        end)
+      else
+        _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
+      end
+    end)
+  end
 end
-- 
cgit v1.2.3


From 16bdc2bcd0600ae4c1fcb55eaa84824af01ee61e Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 2 Dec 2020 16:34:23 -0600
Subject: Make the --force flag for reset command consistent with the others
 and deduplicate db truncation

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 014782c35..ebaf2c623 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -95,7 +95,15 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  def run(["reset" | options]) do
+  def run(["reset", "--force"]) do
+    check_configdb(fn ->
+      start_pleroma()
+      truncatedb()
+      shell_info("The ConfigDB settings have been removed from the database.")
+    end)
+  end
+
+  def run(["reset"]) do
     check_configdb(fn ->
       start_pleroma()
 
@@ -108,13 +116,8 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       shell_error("\nTHIS CANNOT BE UNDONE!")
 
-      proceed? =
-        "--force" in options or
-          shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y)
-
-      if proceed? do
-        Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-        Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        truncatedb()
 
         shell_info("The ConfigDB settings have been removed from the database.")
       else
@@ -189,8 +192,7 @@ defmodule Mix.Tasks.Pleroma.Config do
   defp do_migrate_to_db(config_file) do
     if File.exists?(config_file) do
       shell_info("Migrating settings from file: #{Path.expand(config_file)}")
-      Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
-      Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+      truncatedb()
 
       custom_config =
         config_file
@@ -376,4 +378,9 @@ defmodule Mix.Tasks.Pleroma.Config do
       end
     end)
   end
+
+  defp truncatedb() do
+    Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
+    Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
+  end
 end
-- 
cgit v1.2.3


From 95e908e4e2273a4b07218e45b46ecbeaa0f08e1c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 3 Dec 2020 09:58:24 -0600
Subject: Credo

---
 lib/mix/tasks/pleroma/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index ebaf2c623..a6173e0e2 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -379,7 +379,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     end)
   end
 
-  defp truncatedb() do
+  defp truncatedb do
     Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
     Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
   end
-- 
cgit v1.2.3


From 60c4ac0f708b4a67d6168ed327327dcb13e7219f Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Thu, 3 Dec 2020 16:03:14 +0000
Subject: Apply 6 suggestion(s) to 1 file(s)

---
 lib/mix/tasks/pleroma/config.ex | 61 ++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 41 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index a6173e0e2..f4bb84a13 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -62,7 +62,10 @@ defmodule Mix.Tasks.Pleroma.Config do
       group = maybe_atomize(group)
       key = maybe_atomize(key)
 
-      dump_key(group, key)
+      %{group: group, key: key}
+      |> ConfigDB.get_by_params()
+      |> Repo.all()
+      |> Enum.each(&dump/1)
     end)
   end
 
@@ -297,44 +300,27 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp dump_group(group) when is_atom(group) do
-    ConfigDB
+    %{group: group}
+    |> ConfigDB.get_by_params()
     |> Repo.all()
-    |> Enum.filter(fn x ->
-      if x.group == group do
-        x |> dump
-      end
-    end)
+    |> Enum.each(&dump/1)
   end
 
-  defp group_exists?(group) when is_atom(group) do
-    result =
-      ConfigDB
+  defp group_exists?(group) do
+    %{group: group}
+      |> ConfigDB.get_by_params()
       |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.group == group do
-          x
-        end
-      end)
-
-    unless result == [] do
-      true
-    else
-      false
-    end
+      |> Enum.empty?()
   end
 
   defp maybe_atomize(arg) when is_atom(arg), do: arg
 
   defp maybe_atomize(arg) when is_binary(arg) do
-    chars = String.codepoints(arg)
-
-    # hack to make sure input like Pleroma.Mailer.Foo is formatted correctly
-    # for matching against values returned by Ecto
-    if "." in chars do
-      :"Elixir.#{arg}"
+    if Pleroma.ConfigDB.module_name?(arg) do
+      String.to_existing_atom("Elixir." <> arg)
     else
       String.to_atom(arg)
-    end
+    end 
   end
 
   defp check_configdb(callback) do
@@ -350,13 +336,9 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_key(group, key) do
     check_configdb(fn ->
-      ConfigDB
+      ConfigDB.get_by_params(%{group: group, key: key})
       |> Repo.all()
-      |> Enum.filter(fn x ->
-        if x.group == group and x.key == key do
-          x |> delete(true)
-        end
-      end)
+      |> Enum.each(&delete(&1, true))
     end)
   end
 
@@ -366,13 +348,10 @@ defmodule Mix.Tasks.Pleroma.Config do
         shell_info("The following settings will be removed from ConfigDB:\n")
         dump_group(group)
 
-        ConfigDB
-        |> Repo.all()
-        |> Enum.filter(fn x ->
-          if x.group == group do
-            x |> delete(true)
-          end
-        end)
+      ConfigDB.get_by_params(%{group: group})
+      |> Repo.all()
+      |> Enum.each(&delete(&1, true))
+
       else
         _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
       end
-- 
cgit v1.2.3


From 7fd4f4908bc31b3b4cc9d73a79169c3b3f08714c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 3 Dec 2020 10:03:44 -0600
Subject: dump_key/2 no longer used

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index f4bb84a13..137aef038 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -289,16 +289,6 @@ defmodule Mix.Tasks.Pleroma.Config do
     shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
   end
 
-  defp dump_key(group, key) when is_atom(group) and is_atom(key) do
-    ConfigDB
-    |> Repo.all()
-    |> Enum.filter(fn x ->
-      if x.group == group && x.key == key do
-        x |> dump
-      end
-    end)
-  end
-
   defp dump_group(group) when is_atom(group) do
     %{group: group}
     |> ConfigDB.get_by_params()
-- 
cgit v1.2.3


From a02eb8839650ecbf8bcad9bd6d346fc280985cae Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 3 Dec 2020 19:34:23 +0300
Subject: config_db search methods

---
 lib/mix/tasks/pleroma/config.ex | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 137aef038..63d8c46b5 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -62,9 +62,8 @@ defmodule Mix.Tasks.Pleroma.Config do
       group = maybe_atomize(group)
       key = maybe_atomize(key)
 
-      %{group: group, key: key}
-      |> ConfigDB.get_by_params()
-      |> Repo.all()
+      group
+      |> ConfigDB.get_all_by_group_and_key(key)
       |> Enum.each(&dump/1)
     end)
   end
@@ -290,17 +289,15 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp dump_group(group) when is_atom(group) do
-    %{group: group}
-    |> ConfigDB.get_by_params()
-    |> Repo.all()
+    group
+    |> ConfigDB.get_all_by_group()
     |> Enum.each(&dump/1)
   end
 
   defp group_exists?(group) do
-    %{group: group}
-      |> ConfigDB.get_by_params()
-      |> Repo.all()
-      |> Enum.empty?()
+    group
+    |> ConfigDB.get_all_by_group()
+    |> Enum.empty?()
   end
 
   defp maybe_atomize(arg) when is_atom(arg), do: arg
@@ -310,7 +307,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       String.to_existing_atom("Elixir." <> arg)
     else
       String.to_atom(arg)
-    end 
+    end
   end
 
   defp check_configdb(callback) do
@@ -326,8 +323,8 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_key(group, key) do
     check_configdb(fn ->
-      ConfigDB.get_by_params(%{group: group, key: key})
-      |> Repo.all()
+      group
+      |> ConfigDB.get_all_by_group_and_key(key)
       |> Enum.each(&delete(&1, true))
     end)
   end
@@ -338,10 +335,9 @@ defmodule Mix.Tasks.Pleroma.Config do
         shell_info("The following settings will be removed from ConfigDB:\n")
         dump_group(group)
 
-      ConfigDB.get_by_params(%{group: group})
-      |> Repo.all()
-      |> Enum.each(&delete(&1, true))
-
+        group
+        |> ConfigDB.get_all_by_group()
+        |> Enum.each(&delete(&1, true))
       else
         _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
       end
-- 
cgit v1.2.3


From 4aad066091b63d88dcffa20458a097407da4f5b0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 4 Dec 2020 11:04:53 -0600
Subject: Use Enum.any? to ensure we return true if there are results

---
 lib/mix/tasks/pleroma/config.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 63d8c46b5..d2e9a3760 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -297,7 +297,7 @@ defmodule Mix.Tasks.Pleroma.Config do
   defp group_exists?(group) do
     group
     |> ConfigDB.get_all_by_group()
-    |> Enum.empty?()
+    |> Enum.any?()
   end
 
   defp maybe_atomize(arg) when is_atom(arg), do: arg
-- 
cgit v1.2.3


From 685e5c8509b4c08bb74eab2438912031ab9b1c19 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 4 Dec 2020 11:09:13 -0600
Subject: Use Pleroma.ConfigDB.delete/1 instead of rolling our own

---
 lib/mix/tasks/pleroma/config.ex | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index d2e9a3760..7ec791b36 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -323,9 +323,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_key(group, key) do
     check_configdb(fn ->
-      group
-      |> ConfigDB.get_all_by_group_and_key(key)
-      |> Enum.each(&delete(&1, true))
+      Pleroma.ConfigDB.delete(%{group: group, key: key})
     end)
   end
 
-- 
cgit v1.2.3


From 696d39c3dc32da1e3e163abb413f42d68c3a731f Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 4 Dec 2020 11:19:58 -0600
Subject: Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1

---
 lib/mix/tasks/pleroma/config.ex | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 7ec791b36..00e7be6f4 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -334,8 +334,10 @@ defmodule Mix.Tasks.Pleroma.Config do
         dump_group(group)
 
         group
-        |> ConfigDB.get_all_by_group()
-        |> Enum.each(&delete(&1, true))
+        |> Pleroma.ConfigDB.get_all_by_group()
+        |> Enum.each(fn config ->
+          Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
+        end)
       else
         _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
       end
-- 
cgit v1.2.3


From 3bf5c5b0156e1357db22df8e377c5cd5c5c8ea5a Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 4 Dec 2020 11:30:48 -0600
Subject: Ensure deleting entire group prints out settings that will be removed
 before actually removing them

---
 lib/mix/tasks/pleroma/config.ex | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 00e7be6f4..99dfd0dc3 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -142,7 +142,13 @@ defmodule Mix.Tasks.Pleroma.Config do
 
     group = maybe_atomize(group)
 
-    delete_group(group)
+    with true <- group_exists?(group) do
+      shell_info("The following settings will be removed from ConfigDB:\n")
+      dump_group(group)
+      delete_group(group)
+    else
+      _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
+    end
   end
 
   def run(["delete", group, key]) do
@@ -163,10 +169,17 @@ defmodule Mix.Tasks.Pleroma.Config do
 
     group = maybe_atomize(group)
 
-    if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
-      delete_group(group)
+    with true <- group_exists?(group) do
+      shell_info("The following settings will be removed from ConfigDB:\n")
+      dump_group(group)
+
+      if shell_prompt("Are you sure you want to continue?", "n") in ~w(Yn Y y) do
+        delete_group(group)
+      else
+        shell_error("No changes made.")
+      end
     else
-      shell_error("No changes made.")
+      _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
     end
   end
 
@@ -329,18 +342,11 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_group(group) do
     check_configdb(fn ->
-      with true <- group_exists?(group) do
-        shell_info("The following settings will be removed from ConfigDB:\n")
-        dump_group(group)
-
-        group
-        |> Pleroma.ConfigDB.get_all_by_group()
-        |> Enum.each(fn config ->
-          Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
-        end)
-      else
-        _ -> shell_error("No settings in ConfigDB for #{inspect(group)}. Aborting.")
-      end
+      group
+      |> Pleroma.ConfigDB.get_all_by_group()
+      |> Enum.each(fn config ->
+        Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
+      end)
     end)
   end
 
-- 
cgit v1.2.3


From 9dfda37821d663c4b2f8e113336a517d694abee0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 4 Dec 2020 11:37:49 -0600
Subject: More compact representation

---
 lib/mix/tasks/pleroma/config.ex | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 99dfd0dc3..25f1ca05d 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -344,9 +344,7 @@ defmodule Mix.Tasks.Pleroma.Config do
     check_configdb(fn ->
       group
       |> Pleroma.ConfigDB.get_all_by_group()
-      |> Enum.each(fn config ->
-        Pleroma.ConfigDB.delete(%{group: config.group, key: config.key})
-      end)
+      |> Enum.each(&ConfigDB.delete/1)
     end)
   end
 
-- 
cgit v1.2.3


From 50aadc3d5cc35e5210cb12c4858ecfdba4df56b1 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 27 Nov 2020 13:42:28 -0600
Subject: shell_yes?/1 was not showing the correct message and always defaults
 to yes which is dangerous

---
 lib/mix/tasks/pleroma/user.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index a8d251411..ca9c8579f 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -60,7 +60,7 @@ defmodule Mix.Tasks.Pleroma.User do
       - admin: #{if(admin?, do: "true", else: "false")}
     """)
 
-    proceed? = assume_yes? or shell_yes?("Continue?")
+    proceed? = assume_yes? or shell_prompt("Continue?", "n") in ~w(Yn Y y)
 
     if proceed? do
       start_pleroma()
-- 
cgit v1.2.3


From e00c66714590948ef917909779772155e20a3c96 Mon Sep 17 00:00:00 2001
From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sun, 6 Dec 2020 18:02:30 +0300
Subject: [#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.
 Minor fixes.

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 25f1ca05d..b5d802948 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -5,6 +5,7 @@
 defmodule Mix.Tasks.Pleroma.Config do
   use Mix.Task
 
+  import Ecto.Query
   import Mix.Pleroma
 
   alias Pleroma.ConfigDB
@@ -48,7 +49,7 @@ defmodule Mix.Tasks.Pleroma.Config do
       unless settings == [] do
         shell_info("#{header}")
 
-        settings |> Enum.each(&dump(&1))
+        Enum.each(settings, &dump(&1))
       else
         shell_error("No settings in ConfigDB.")
       end
@@ -63,8 +64,8 @@ defmodule Mix.Tasks.Pleroma.Config do
       key = maybe_atomize(key)
 
       group
-      |> ConfigDB.get_all_by_group_and_key(key)
-      |> Enum.each(&dump/1)
+      |> ConfigDB.get_by_group_and_key(key)
+      |> dump()
     end)
   end
 
@@ -84,10 +85,9 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       groups =
         ConfigDB
+        |> distinct([c], true)
+        |> select([c], c.group)
         |> Repo.all()
-        |> Enum.map(fn x -> x.group end)
-        |> Enum.sort()
-        |> Enum.uniq()
 
       if length(groups) > 0 do
         shell_info("The following configuration groups are set in ConfigDB:\r\n")
@@ -295,12 +295,14 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete(_config, _), do: :ok
 
-  defp dump(%Pleroma.ConfigDB{} = config) do
+  defp dump(%ConfigDB{} = config) do
     value = inspect(config.value, limit: :infinity)
 
     shell_info("config #{inspect(config.group)}, #{inspect(config.key)}, #{value}\r\n\r\n")
   end
 
+  defp dump(_), do: :noop
+
   defp dump_group(group) when is_atom(group) do
     group
     |> ConfigDB.get_all_by_group()
@@ -316,7 +318,7 @@ defmodule Mix.Tasks.Pleroma.Config do
   defp maybe_atomize(arg) when is_atom(arg), do: arg
 
   defp maybe_atomize(arg) when is_binary(arg) do
-    if Pleroma.ConfigDB.module_name?(arg) do
+    if ConfigDB.module_name?(arg) do
       String.to_existing_atom("Elixir." <> arg)
     else
       String.to_atom(arg)
@@ -336,14 +338,14 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp delete_key(group, key) do
     check_configdb(fn ->
-      Pleroma.ConfigDB.delete(%{group: group, key: key})
+      ConfigDB.delete(%{group: group, key: key})
     end)
   end
 
   defp delete_group(group) do
     check_configdb(fn ->
       group
-      |> Pleroma.ConfigDB.get_all_by_group()
+      |> ConfigDB.get_all_by_group()
       |> Enum.each(&ConfigDB.delete/1)
     end)
   end
-- 
cgit v1.2.3


From d817bae802c40bd2db9a88970cf24e98374b0af0 Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Mon, 7 Dec 2020 17:13:29 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index b5d802948..2ecad3578 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -316,6 +316,8 @@ defmodule Mix.Tasks.Pleroma.Config do
   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
-- 
cgit v1.2.3


From 61494b5245619eda38f05d010511df068280cff8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 7 Dec 2020 11:22:07 -0600
Subject: Formatting

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

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 2ecad3578..d1af0a60c 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -316,8 +316,8 @@ defmodule Mix.Tasks.Pleroma.Config do
   end
 
   defp maybe_atomize(arg) when is_atom(arg), do: arg
- 
-   defp maybe_atomize(":" <> arg), do: maybe_atomize(arg)
+
+  defp maybe_atomize(":" <> arg), do: maybe_atomize(arg)
 
   defp maybe_atomize(arg) when is_binary(arg) do
     if ConfigDB.module_name?(arg) do
-- 
cgit v1.2.3


From 93428d7c11ce30d38fa23192c9a15e2e713a50be Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 7 Dec 2020 11:45:56 -0600
Subject: Print out settings that will be removed when specifying the group and
 key for consistency

Fix error message when specified key doesn't exist
---
 lib/mix/tasks/pleroma/config.ex | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index d1af0a60c..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,6 +337,13 @@ 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)
-- 
cgit v1.2.3


From 6aece536eb394fd82e1368e7ae3e484959d05d8c Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 12 Dec 2020 20:35:38 +0300
Subject: instance.gen task: Only show files which will be actually overwritten

---
 lib/mix/tasks/pleroma/instance.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index ac8688424..a4f1c81bc 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -253,7 +253,7 @@ defmodule Mix.Tasks.Pleroma.Instance do
     else
       shell_error(
         "The task would have overwritten the following files:\n" <>
-          (Enum.map(paths, &"- #{&1}\n") |> Enum.join("")) <>
+          (Enum.map(will_overwrite, &"- #{&1}\n") |> Enum.join("")) <>
           "Rerun with `--force` to overwrite them."
       )
     end
-- 
cgit v1.2.3


From 7133c0c5ea7f9966d92e53acb52429746fbe51e6 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Sat, 12 Dec 2020 20:37:14 +0300
Subject: instance.gen: Warn that stripping exif requires exiftool

And default to no if it is not installed

Closes #2343
---
 lib/mix/tasks/pleroma/instance.ex | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex
index a4f1c81bc..853c4eaa2 100644
--- a/lib/mix/tasks/pleroma/instance.ex
+++ b/lib/mix/tasks/pleroma/instance.ex
@@ -161,12 +161,21 @@ defmodule Mix.Tasks.Pleroma.Instance do
         )
         |> Path.expand()
 
+      {strip_uploads_message, strip_uploads_default} =
+        if Pleroma.Utils.command_available?("exiftool") do
+          {"Do you want to strip location (GPS) data from uploaded images? This requires exiftool, it was detected as installed. (y/n)",
+           "y"}
+        else
+          {"Do you want to strip location (GPS) data from uploaded images? This requires exiftool, it was detected as not installed, please install it if you answer yes. (y/n)",
+           "n"}
+        end
+
       strip_uploads =
         get_option(
           options,
           :strip_uploads,
-          "Do you want to strip location (GPS) data from uploaded images? (y/n)",
-          "y"
+          strip_uploads_message,
+          strip_uploads_default
         ) === "y"
 
       anonymize_uploads =
-- 
cgit v1.2.3


From cebe3c7deff87ba24f43efcf50499c45d3b3e3f9 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Sat, 12 Dec 2020 17:30:08 +0300
Subject: Fix for dropping posts/notifs in WS when mix task is executed

- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
---
 lib/mix/tasks/pleroma/database.ex | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index a01c36ece..22151ce08 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -48,9 +48,15 @@ defmodule Mix.Tasks.Pleroma.Database do
   def run(["update_users_following_followers_counts"]) do
     start_pleroma()
 
-    User
-    |> Repo.all()
-    |> Enum.each(&User.update_follower_count/1)
+    Repo.transaction(
+      fn ->
+        from(u in User, select: u)
+        |> Repo.stream()
+        |> Stream.each(&User.update_follower_count/1)
+        |> Stream.run()
+      end,
+      timeout: :infinity
+    )
   end
 
   def run(["prune_objects" | args]) do
-- 
cgit v1.2.3


From acb03d591bea1b20a715201f479f1ad7bf7bb67b Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 31 Jul 2020 16:46:35 +0200
Subject: Insert text representation of hashtags into object["hashtags"]

Includes a new mix task: pleroma.database fill_old_hashtags
---
 lib/mix/tasks/pleroma/database.ex | 43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 22151ce08..0c1343313 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -128,6 +128,49 @@ defmodule Mix.Tasks.Pleroma.Database do
     |> Stream.run()
   end
 
+  def run(["fill_old_hashtags"]) do
+    import Ecto.Query
+
+    start_pleroma()
+
+    from(
+      o in Object,
+      where: fragment("(?)->>'hashtags' is null", o.data),
+      where: fragment("(?)->>'tag' != '[]'", o.data),
+      select: %{id: o.id, tag: fragment("(?)->>'tag'", o.data)},
+      order_by: [:desc, o.id]
+    )
+    |> Pleroma.Repo.chunk_stream(200, :batches)
+    |> Stream.each(fn objects ->
+      Repo.transaction(fn ->
+        objects_first = objects |> List.first()
+        objects_last = objects |> List.last()
+
+        Logger.info(
+          "fill_old_hashtags: #{objects_first.id} (#{objects_first.inserted_at}) -- #{
+            objects_last.id
+          } (#{objects_last.inserted_at})"
+        )
+
+        objects
+        |> Enum.map(fn object ->
+          tags =
+            object.tag
+            |> Jason.decode!()
+            |> Enum.filter(&is_bitstring(&1))
+
+          Object
+          |> where([o], o.id == ^object.id)
+          |> update([o],
+            set: [data: fragment("safe_jsonb_set(?, '{hashtags}', ?, true)", o.data, ^tags)]
+          )
+          |> Repo.update_all([], timeout: :infinity)
+        end)
+      end)
+    end)
+    |> Stream.run()
+  end
+
   def run(["vacuum", args]) do
     start_pleroma()
 
-- 
cgit v1.2.3


From d0c2479710b40a88b3a74c85c9ed9e72e9a2bfaf Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 22 Dec 2020 05:11:19 +0100
Subject: pleroma.database fill_old_hashtags: Add month_limit argument

---
 lib/mix/tasks/pleroma/database.ex | 74 ++++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 33 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 0c1343313..a09852503 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -128,47 +128,55 @@ defmodule Mix.Tasks.Pleroma.Database do
     |> Stream.run()
   end
 
-  def run(["fill_old_hashtags"]) do
+  def run(["fill_old_hashtags", month_limit]) do
     import Ecto.Query
 
     start_pleroma()
 
-    from(
-      o in Object,
-      where: fragment("(?)->>'hashtags' is null", o.data),
-      where: fragment("(?)->>'tag' != '[]'", o.data),
-      select: %{id: o.id, tag: fragment("(?)->>'tag'", o.data)},
-      order_by: [:desc, o.id]
-    )
-    |> Pleroma.Repo.chunk_stream(200, :batches)
-    |> Stream.each(fn objects ->
-      Repo.transaction(fn ->
-        objects_first = objects |> List.first()
-        objects_last = objects |> List.last()
-
-        Logger.info(
-          "fill_old_hashtags: #{objects_first.id} (#{objects_first.inserted_at}) -- #{
-            objects_last.id
-          } (#{objects_last.inserted_at})"
-        )
+    month_limit = String.to_integer(month_limit)
 
-        objects
-        |> Enum.map(fn object ->
-          tags =
-            object.tag
-            |> Jason.decode!()
-            |> Enum.filter(&is_bitstring(&1))
-
-          Object
-          |> where([o], o.id == ^object.id)
-          |> update([o],
-            set: [data: fragment("safe_jsonb_set(?, '{hashtags}', ?, true)", o.data, ^tags)]
+    if month_limit < 1 do
+      shell_error("Invalid `month_limit` argument, needs to be greater than 1")
+    else
+      time_limit = DateTime.utc_now() |> Timex.shift(months: -month_limit)
+
+      from(
+        o in Object,
+        where: fragment("(?)->>'hashtags' is null", o.data),
+        where: fragment("(?)->>'tag' != '[]'", o.data),
+        where: o.inserted_at < ^time_limit,
+        select: %{id: o.id, tag: fragment("(?)->>'tag'", o.data)}
+      )
+      |> Pleroma.Repo.chunk_stream(200, :batches)
+      |> Stream.each(fn objects ->
+        Repo.transaction(fn ->
+          objects_first = objects |> List.first()
+          objects_last = objects |> List.last()
+
+          Logger.info(
+            "fill_old_hashtags: #{objects_first.id} (#{objects_first.inserted_at}) -- #{
+              objects_last.id
+            } (#{objects_last.inserted_at})"
           )
-          |> Repo.update_all([], timeout: :infinity)
+
+          objects
+          |> Enum.map(fn object ->
+            tags =
+              object.tag
+              |> Jason.decode!()
+              |> Enum.filter(&is_bitstring(&1))
+
+            Object
+            |> where([o], o.id == ^object.id)
+            |> update([o],
+              set: [data: fragment("safe_jsonb_set(?, '{hashtags}', ?, true)", o.data, ^tags)]
+            )
+            |> Repo.update_all([], timeout: :infinity)
+          end)
         end)
       end)
-    end)
-    |> Stream.run()
+      |> Stream.run()
+    end
   end
 
   def run(["vacuum", args]) do
-- 
cgit v1.2.3


From 3966add048fda791e6893540d8304b0e626ab9f4 Mon Sep 17 00:00:00 2001
From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Mon, 28 Dec 2020 12:02:16 +0000
Subject: Revert "Merge branch 'features/hashtag-column' into 'develop'"

This reverts merge request !2824
---
 lib/mix/tasks/pleroma/database.ex | 51 ---------------------------------------
 1 file changed, 51 deletions(-)

(limited to 'lib/mix/tasks')

diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index a09852503..22151ce08 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -128,57 +128,6 @@ defmodule Mix.Tasks.Pleroma.Database do
     |> Stream.run()
   end
 
-  def run(["fill_old_hashtags", month_limit]) do
-    import Ecto.Query
-
-    start_pleroma()
-
-    month_limit = String.to_integer(month_limit)
-
-    if month_limit < 1 do
-      shell_error("Invalid `month_limit` argument, needs to be greater than 1")
-    else
-      time_limit = DateTime.utc_now() |> Timex.shift(months: -month_limit)
-
-      from(
-        o in Object,
-        where: fragment("(?)->>'hashtags' is null", o.data),
-        where: fragment("(?)->>'tag' != '[]'", o.data),
-        where: o.inserted_at < ^time_limit,
-        select: %{id: o.id, tag: fragment("(?)->>'tag'", o.data)}
-      )
-      |> Pleroma.Repo.chunk_stream(200, :batches)
-      |> Stream.each(fn objects ->
-        Repo.transaction(fn ->
-          objects_first = objects |> List.first()
-          objects_last = objects |> List.last()
-
-          Logger.info(
-            "fill_old_hashtags: #{objects_first.id} (#{objects_first.inserted_at}) -- #{
-              objects_last.id
-            } (#{objects_last.inserted_at})"
-          )
-
-          objects
-          |> Enum.map(fn object ->
-            tags =
-              object.tag
-              |> Jason.decode!()
-              |> Enum.filter(&is_bitstring(&1))
-
-            Object
-            |> where([o], o.id == ^object.id)
-            |> update([o],
-              set: [data: fragment("safe_jsonb_set(?, '{hashtags}', ?, true)", o.data, ^tags)]
-            )
-            |> Repo.update_all([], timeout: :infinity)
-          end)
-        end)
-      end)
-      |> Stream.run()
-    end
-  end
-
   def run(["vacuum", args]) do
     start_pleroma()
 
-- 
cgit v1.2.3