X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fworkers%2Fpurge_expired_activity.ex;h=652e1d6b19008c563f4c973122eba6f9f2450ce7;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=ffcb89dc374a29bb249ad2cc10d14aa52ee71f83;hpb=2c2094d4b2722cf511e3db8288c3754a48038f05;p=akkoma

diff --git a/lib/pleroma/workers/purge_expired_activity.ex b/lib/pleroma/workers/purge_expired_activity.ex
index ffcb89dc3..652e1d6b1 100644
--- a/lib/pleroma/workers/purge_expired_activity.ex
+++ b/lib/pleroma/workers/purge_expired_activity.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Workers.PurgeExpiredActivity do
@@ -7,7 +7,7 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
   Worker which purges expired activity.
   """
 
-  use Oban.Worker, queue: :activity_expiration, max_attempts: 1
+  use Oban.Worker, queue: :activity_expiration, max_attempts: 1, unique: [period: :infinity]
 
   import Ecto.Query
 
@@ -18,8 +18,7 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
           | {:error, :expired_activities_disabled}
           | {:error, :expiration_too_close}
   def enqueue(args) do
-    with true <- enabled?(),
-         args when is_map(args) <- validate_expires_at(args) do
+    with true <- enabled?() do
       {scheduled_at, args} = Map.pop(args, :expires_at)
 
       args
@@ -28,6 +27,11 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
     end
   end
 
+  @impl Oban.Worker
+  def timeout(_job) do
+    Pleroma.Config.get([:workers, :timeout, :activity_expiration], :timer.minutes(1))
+  end
+
   @impl true
   def perform(%Oban.Job{args: %{"activity_id" => id}}) do
     with %Activity{} = activity <- find_activity(id),
@@ -42,16 +46,6 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
     end
   end
 
-  defp validate_expires_at(%{validate: false} = args), do: Map.delete(args, :validate)
-
-  defp validate_expires_at(args) do
-    if expires_late_enough?(args[:expires_at]) do
-      args
-    else
-      {:error, :expiration_too_close}
-    end
-  end
-
   defp find_activity(id) do
     with nil <- Activity.get_by_id_with_object(id) do
       {:error, :activity_not_found}