ActivityExpirationWorker: Fix merge issues.

2019-08-24 17:22:26 +02:00 · 2019-08-24 17:22:26 +02:00 · 1692fa8945
commit 1692fa8945
parent cc6c0b4ba6
2 changed files with 2 additions and 2 deletions
--- 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

--- 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() ++