cleap up

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index de16cc52c920b5298ee90043975e7f9c65d95700..9f0bf6ecbc4fc3e3f858f0708949a7009d1ace28 100644 (file)
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -3,8 +3,18 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Pleroma do
-  @apps [:restarter, :ecto, :ecto_sql, :postgrex, :db_connection, :cachex]
-  @cachex_childs ["object", "user"]
+  @apps [
+    :restarter,
+    :ecto,
+    :ecto_sql,
+    :postgrex,
+    :db_connection,
+    :cachex,
+    :flake_id,
+    :swoosh,
+    :timex
+  ]
+  @cachex_children ["object", "user"]
   @doc "Common functions to be reused in mix tasks"
   def start_pleroma do
     Pleroma.Config.Holder.save_default()
@@ -23,15 +33,15 @@ defmodule Mix.Pleroma do
 
     Enum.each(apps, &Application.ensure_all_started/1)
 
-    childs = [
+    children = [
       Pleroma.Repo,
       {Pleroma.Config.TransferTask, false},
       Pleroma.Web.Endpoint
     ]
 
-    cachex_childs = Enum.map(@cachex_childs, &Pleroma.Application.build_cachex(&1, []))
+    cachex_children = Enum.map(@cachex_children, &Pleroma.Application.build_cachex(&1, []))
 
-    Supervisor.start_link(childs ++ cachex_childs,
+    Supervisor.start_link(children ++ cachex_children,
       strategy: :one_for_one,
       name: Pleroma.Supervisor
     )

diff --git a/lib/mix/tasks/pleroma/digest.ex b/lib/mix/tasks/pleroma/digest.ex
index 8bde2d4f290bdd848db42a14302a90bf11c4fcdb..3595f912d622ab0dd54de666adb7a4ddad553d08 100644 (file)
--- a/lib/mix/tasks/pleroma/digest.ex
+++ b/lib/mix/tasks/pleroma/digest.ex
@@ -7,8 +7,6 @@ defmodule Mix.Tasks.Pleroma.Digest do
 
   def run(["test", nickname | opts]) do
     Mix.Pleroma.start_pleroma()
-    Application.ensure_all_started(:timex)
-    Application.ensure_all_started(:swoosh)
 
     user = Pleroma.User.get_by_nickname(nickname)
 

diff --git a/lib/mix/tasks/pleroma/email.ex b/lib/mix/tasks/pleroma/email.ex
index 16fe314313f7513efcb854e59202e92732268c9a..d3fac6ec8f3420da3ec0b765932b49ba432f42e6 100644 (file)
--- a/lib/mix/tasks/pleroma/email.ex
+++ b/lib/mix/tasks/pleroma/email.ex
@@ -7,7 +7,6 @@ defmodule Mix.Tasks.Pleroma.Email do
 
   def run(["test" | args]) do
     Mix.Pleroma.start_pleroma()
-    Application.ensure_all_started(:swoosh)
 
     {options, [], []} =
       OptionParser.parse(

diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index b67d256c3278a2780564df3c8cc28562e6cb346a..c3312507e93786dcbebe0194177d84f9fc112c38 100644 (file)
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -12,7 +12,6 @@ defmodule Mix.Tasks.Pleroma.Relay do
 
   def run(["follow", target]) do
     start_pleroma()
-    Application.ensure_all_started(:flake_id)
 
     with {:ok, _activity} <- Relay.follow(target) do
       # put this task to sleep to allow the genserver to push out the messages
@@ -24,7 +23,6 @@ defmodule Mix.Tasks.Pleroma.Relay do
 
   def run(["unfollow", target]) do
     start_pleroma()
-    Application.ensure_all_started(:flake_id)
 
     with {:ok, _activity} <- Relay.unfollow(target) do
       # put this task to sleep to allow the genserver to push out the messages
@@ -36,7 +34,6 @@ defmodule Mix.Tasks.Pleroma.Relay do
 
   def run(["list"]) do
     start_pleroma()
-    Application.ensure_all_started(:flake_id)
 
     with {:ok, list} <- Relay.list(true) do
       list |> Enum.each(&shell_info(&1))

diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index a9370b5e738cdb3f812f6b6b4fbe1201e6f05b88..01824aa18b0f45dda65716d6189856f3394f63c1 100644 (file)
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -15,8 +15,6 @@ defmodule Mix.Tasks.Pleroma.User do
   @moduledoc File.read!("docs/administration/CLI_tasks/user.md")
 
   def run(["new", nickname, email | rest]) do
-    Application.ensure_all_started(:flake_id)
-
     {options, [], []} =
       OptionParser.parse(
         rest,
@@ -99,7 +97,6 @@ defmodule Mix.Tasks.Pleroma.User do
 
   def run(["rm", nickname]) do
     start_pleroma()
-    Application.ensure_all_started(:flake_id)
 
     with %User{local: true} = user <- User.get_cached_by_nickname(nickname),
          {:ok, delete_data, _} <- Builder.delete(user, user.ap_id),
@@ -331,7 +328,6 @@ defmodule Mix.Tasks.Pleroma.User do
 
   def run(["delete_activities", nickname]) do
     start_pleroma()
-    Application.ensure_all_started(:flake_id)
 
     with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
       User.delete_user_activities(user)