From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 9 Jul 2020 16:13:16 +0000 (+0300)
Subject: cleap up
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=79707e879d3af359be9e1f6ac10717cc9cb72b2c;p=akkoma

cleap up
---

diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index de16cc52c..9f0bf6ecb 100644
--- 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 8bde2d4f2..3595f912d 100644
--- 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 16fe31431..d3fac6ec8 100644
--- 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 b67d256c3..c3312507e 100644
--- 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 a9370b5e7..01824aa18 100644
--- 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)