X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fapplication.ex;h=0c27027a0ec1de9ca2640d798526d4d80c97ea5a;hb=eb17cc17a146471d3774fc2b972128dd75eb05af;hp=c460a3bc51bd88c0a7b3636d3bae3fd1b9ddf269;hpb=15ef521009f4c232f417ca9164c6be3f4ee4e018;p=akkoma

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index c460a3bc5..0c27027a0 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -31,18 +31,19 @@ defmodule Pleroma.Application do
     children =
       [
         Pleroma.Repo,
+        Pleroma.Scheduler,
         Pleroma.Config.TransferTask,
         Pleroma.Emoji,
         Pleroma.Captcha,
         Pleroma.FlakeId,
-        Pleroma.ScheduledActivityWorker
+        Pleroma.Daemons.ScheduledActivityDaemon,
+        Pleroma.Daemons.ActivityExpirationDaemon
       ] ++
         cachex_children() ++
         hackney_pool_children() ++
         [
-          Pleroma.Web.Federator.RetryQueue,
-          Pleroma.Web.OAuth.Token.CleanWorker,
           Pleroma.Stats,
+          {Oban, Pleroma.Config.get(Oban)},
           %{
             id: :web_push_init,
             start: {Task, :start_link, [&Pleroma.Web.Push.init/0]},
@@ -70,9 +71,7 @@ defmodule Pleroma.Application do
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
-    result = Supervisor.start_link(children, opts)
-    :ok = after_supervisor_start()
-    result
+    Supervisor.start_link(children, opts)
   end
 
   defp setup_instrumenters do
@@ -121,17 +120,17 @@ defmodule Pleroma.Application do
   end
 
   defp idempotency_expiration,
-       do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))
+    do: expiration(default: :timer.seconds(6 * 60 * 60), interval: :timer.seconds(60))
 
   defp seconds_valid_interval,
-       do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
+    do: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid]))
 
   defp build_cachex(type, opts),
-       do: %{
-         id: String.to_atom("cachex_" <> type),
-         start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
-         type: :worker
-       }
+    do: %{
+      id: String.to_atom("cachex_" <> type),
+      start: {Cachex, :start_link, [String.to_atom(type <> "_cache"), opts]},
+      type: :worker
+    }
 
   defp chat_enabled?, do: Pleroma.Config.get([:chat, :enabled])
 
@@ -145,7 +144,7 @@ defmodule Pleroma.Application do
   end
 
   defp oauth_cleanup_child(true),
-       do: [Pleroma.Web.OAuth.Token.CleanWorker]
+    do: [Pleroma.Web.OAuth.Token.CleanWorker]
 
   defp oauth_cleanup_child(_), do: []
 
@@ -163,17 +162,4 @@ defmodule Pleroma.Application do
       :hackney_pool.child_spec(pool, options)
     end
   end
-
-  defp after_supervisor_start do
-    with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
-         true <- digest_config[:active] do
-      PleromaJobQueue.schedule(
-        digest_config[:schedule],
-        :digest_emails,
-        Pleroma.DigestEmailWorker
-      )
-    end
-
-    :ok
-  end
 end