Merge branch 'tests/activity_pub' into 'develop'

[akkoma] / lib / pleroma / application.ex

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index c460a3bc51bd88c0a7b3636d3bae3fd1b9ddf269..483ac1f39e8558ed9ec512c28fa3fa7e9aa57c64 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -35,13 +35,13 @@ defmodule Pleroma.Application do
         Pleroma.Emoji,
         Pleroma.Captcha,
         Pleroma.FlakeId,
-        Pleroma.ScheduledActivityWorker
+        Pleroma.ScheduledActivityWorker,
+        Pleroma.ActivityExpirationWorker
       ] ++
         cachex_children() ++
         hackney_pool_children() ++
         [
           Pleroma.Web.Federator.RetryQueue,
-          Pleroma.Web.OAuth.Token.CleanWorker,
           Pleroma.Stats,
           %{
             id: :web_push_init,
@@ -121,17 +121,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 +145,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: []