mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-10 19:29:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleap up

Browse source
This commit is contained in:
Alexander Strizhakov 2020-07-09 19:13:16 +03:00
parent d5fcec8315
commit 79707e879d
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/mix/pleroma.ex
View file

@ -3,8 +3,18 @@
# SPDX-License-Identifier: AGPL-3.0-only # SPDX-License-Identifier: AGPL-3.0-only
defmodule Mix.Pleroma do defmodule Mix.Pleroma do
@apps [:restarter, :ecto, :ecto_sql, :postgrex, :db_connection, :cachex] @apps [
@cachex_childs ["object", "user"] :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" @doc "Common functions to be reused in mix tasks"
def start_pleroma do def start_pleroma do
Pleroma.Config.Holder.save_default() Pleroma.Config.Holder.save_default()
@ -23,15 +33,15 @@ defmodule Mix.Pleroma do
Enum.each(apps, &Application.ensure_all_started/1) Enum.each(apps, &Application.ensure_all_started/1)
childs = [ children = [
Pleroma.Repo, Pleroma.Repo,
{Pleroma.Config.TransferTask, false}, {Pleroma.Config.TransferTask, false},
Pleroma.Web.Endpoint 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, strategy: :one_for_one,
name: Pleroma.Supervisor name: Pleroma.Supervisor
) )

2
lib/mix/tasks/pleroma/digest.ex
View file

@ -7,8 +7,6 @@ defmodule Mix.Tasks.Pleroma.Digest do
def run(["test", nickname | opts]) do def run(["test", nickname | opts]) do
Mix.Pleroma.start_pleroma() Mix.Pleroma.start_pleroma()
Application.ensure_all_started(:timex)
Application.ensure_all_started(:swoosh)
user = Pleroma.User.get_by_nickname(nickname) user = Pleroma.User.get_by_nickname(nickname)

1
lib/mix/tasks/pleroma/email.ex
View file

@ -7,7 +7,6 @@ defmodule Mix.Tasks.Pleroma.Email do
def run(["test" | args]) do def run(["test" | args]) do
Mix.Pleroma.start_pleroma() Mix.Pleroma.start_pleroma()
Application.ensure_all_started(:swoosh)
{options, [], []} = {options, [], []} =
OptionParser.parse( OptionParser.parse(

3
lib/mix/tasks/pleroma/relay.ex
View file

@ -12,7 +12,6 @@ defmodule Mix.Tasks.Pleroma.Relay do
def run(["follow", target]) do def run(["follow", target]) do
start_pleroma() start_pleroma()
Application.ensure_all_started(:flake_id)
with {:ok, _activity} <- Relay.follow(target) do with {:ok, _activity} <- Relay.follow(target) do
# put this task to sleep to allow the genserver to push out the messages # 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 def run(["unfollow", target]) do
start_pleroma() start_pleroma()
Application.ensure_all_started(:flake_id)
with {:ok, _activity} <- Relay.unfollow(target) do with {:ok, _activity} <- Relay.unfollow(target) do
# put this task to sleep to allow the genserver to push out the messages # 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 def run(["list"]) do
start_pleroma() start_pleroma()
Application.ensure_all_started(:flake_id)
with {:ok, list} <- Relay.list(true) do with {:ok, list} <- Relay.list(true) do
list |> Enum.each(&shell_info(&1)) list |> Enum.each(&shell_info(&1))

4
lib/mix/tasks/pleroma/user.ex
View file

@ -15,8 +15,6 @@ defmodule Mix.Tasks.Pleroma.User do
@moduledoc File.read!("docs/administration/CLI_tasks/user.md") @moduledoc File.read!("docs/administration/CLI_tasks/user.md")
def run(["new", nickname, email | rest]) do def run(["new", nickname, email | rest]) do
Application.ensure_all_started(:flake_id)
{options, [], []} = {options, [], []} =
OptionParser.parse( OptionParser.parse(
rest, rest,
@ -99,7 +97,6 @@ defmodule Mix.Tasks.Pleroma.User do
def run(["rm", nickname]) do def run(["rm", nickname]) do
start_pleroma() start_pleroma()
Application.ensure_all_started(:flake_id)
with %User{local: true} = user <- User.get_cached_by_nickname(nickname), with %User{local: true} = user <- User.get_cached_by_nickname(nickname),
{:ok, delete_data, _} <- Builder.delete(user, user.ap_id), {: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 def run(["delete_activities", nickname]) do
start_pleroma() start_pleroma()
Application.ensure_all_started(:flake_id)
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
User.delete_user_activities(user) User.delete_user_activities(user)