diff options
| author | Mark Felder <feld@feld.me> | 2024-06-19 21:25:24 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-06-19 22:24:48 -0400 |
| commit | 4dfa50f256ce7966ff127a12f91c9fdeabfff114 (patch) | |
| tree | 7a6c635d3bd3cce0344c8582b4b69b1321fbdc7a | |
| parent | 9a4cdde5c9e833a8cc61d660f5627717756778d2 (diff) | |
| download | pleroma-4dfa50f256ce7966ff127a12f91c9fdeabfff114.tar.gz pleroma-4dfa50f256ce7966ff127a12f91c9fdeabfff114.zip | |
Rename RichMediaExpirationWorker to RichMediaWorker
| -rw-r--r-- | lib/pleroma/web/rich_media/backfill.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/workers/rich_media_worker.ex (renamed from lib/pleroma/workers/rich_media_expiration_worker.ex) | 4 | ||||
| -rw-r--r-- | test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs | 5 | ||||
| -rw-r--r-- | test/pleroma/web/rich_media/parser/ttl/opengraph_test.exs | 5 |
4 files changed, 12 insertions, 6 deletions
diff --git a/lib/pleroma/web/rich_media/backfill.ex b/lib/pleroma/web/rich_media/backfill.ex index 4ec50e132..46b879434 100644 --- a/lib/pleroma/web/rich_media/backfill.ex +++ b/lib/pleroma/web/rich_media/backfill.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.RichMedia.Backfill do alias Pleroma.Web.RichMedia.Card alias Pleroma.Web.RichMedia.Parser alias Pleroma.Web.RichMedia.Parser.TTL - alias Pleroma.Workers.RichMediaExpirationWorker + alias Pleroma.Workers.RichMediaWorker require Logger @@ -72,7 +72,7 @@ defmodule Pleroma.Web.RichMedia.Backfill do {:ok, ttl} when is_number(ttl) -> timestamp = DateTime.from_unix!(ttl) - RichMediaExpirationWorker.new(%{"url" => url}, scheduled_at: timestamp) + RichMediaWorker.new(%{"op" => "expire", "url" => url}, scheduled_at: timestamp) |> Oban.insert() _ -> diff --git a/lib/pleroma/workers/rich_media_expiration_worker.ex b/lib/pleroma/workers/rich_media_worker.ex index 0b74687cf..968395c64 100644 --- a/lib/pleroma/workers/rich_media_expiration_worker.ex +++ b/lib/pleroma/workers/rich_media_worker.ex @@ -2,14 +2,14 @@ # Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Workers.RichMediaExpirationWorker do +defmodule Pleroma.Workers.RichMediaWorker do alias Pleroma.Web.RichMedia.Card use Oban.Worker, queue: :background @impl Oban.Worker - def perform(%Job{args: %{"url" => url} = _args}) do + def perform(%Job{args: %{"op" => "expire", "url" => url} = _args}) do Card.delete(url) end end diff --git a/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs b/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs index cc28aa7f3..8fd9e6a5f 100644 --- a/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs +++ b/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs @@ -74,7 +74,10 @@ defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrlTest do Card.get_or_backfill_by_url(url) - assert_enqueued(worker: Pleroma.Workers.RichMediaExpirationWorker, args: %{"url" => url}) + assert_enqueued( + worker: Pleroma.Workers.RichMediaWorker, + args: %{"op" => "expire", "url" => url} + ) [%Oban.Job{scheduled_at: scheduled_at}] = all_enqueued() diff --git a/test/pleroma/web/rich_media/parser/ttl/opengraph_test.exs b/test/pleroma/web/rich_media/parser/ttl/opengraph_test.exs index 770968d47..e275ee523 100644 --- a/test/pleroma/web/rich_media/parser/ttl/opengraph_test.exs +++ b/test/pleroma/web/rich_media/parser/ttl/opengraph_test.exs @@ -36,6 +36,9 @@ defmodule Pleroma.Web.RichMedia.Parser.TTL.OpengraphTest do Card.get_or_backfill_by_url(url) - assert_enqueued(worker: Pleroma.Workers.RichMediaExpirationWorker, args: %{"url" => url}) + assert_enqueued( + worker: Pleroma.Workers.RichMediaWorker, + args: %{"op" => "expire", "url" => url} + ) end end |