ActivityExpirationWorker: Fix merge issues.

diff --git a/lib/pleroma/activity_expiration_worker.ex b/lib/pleroma/activity_expiration_worker.ex
index a341f58df32af1626f7d8d2f08d6607044e44abd..0f9e715f8f385eee5c86d973011a732211fa04a3 100644 (file)
--- a/lib/pleroma/activity_expiration_worker.ex
+++ b/lib/pleroma/activity_expiration_worker.ex
@@ -15,7 +15,7 @@ defmodule Pleroma.ActivityExpirationWorker do
 
   @schedule_interval :timer.minutes(1)
 
-  def start_link do
+  def start_link(_) do
     GenServer.start_link(__MODULE__, nil)
   end
 

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 1e4de272cda5a0d5147ef8514735afd5d814d780..483ac1f39e8558ed9ec512c28fa3fa7e9aa57c64 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -36,7 +36,7 @@ defmodule Pleroma.Application do
         Pleroma.Captcha,
         Pleroma.FlakeId,
         Pleroma.ScheduledActivityWorker,
-        Pleroma.ActiviyExpirationWorker
+        Pleroma.ActivityExpirationWorker
       ] ++
         cachex_children() ++
         hackney_pool_children() ++