diff options
| author | feld <feld@feld.me> | 2024-07-12 14:56:55 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-07-12 14:56:55 +0000 |
| commit | 3754713599e474754f3d4c07221a88352be8c018 (patch) | |
| tree | ddc56052bbc91a2dfeb807dae05b90d2e5e345b7 | |
| parent | 680da772e7397af122d8fbd822e99fb3382d37c8 (diff) | |
| parent | b051e68bb025417738579b027e4b039ffb9b19da (diff) | |
| download | pleroma-3754713599e474754f3d4c07221a88352be8c018.tar.gz pleroma-3754713599e474754f3d4c07221a88352be8c018.zip | |
Merge branch 'oban/fetcher-discard-rejected' into 'develop'
Discard Remote Fetcher jobs which errored due to an MRF rejection
See merge request pleroma/pleroma!4174
| -rw-r--r-- | changelog.d/oban-fetcher-rejected.change | 1 | ||||
| -rw-r--r-- | lib/pleroma/workers/remote_fetcher_worker.ex | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/oban-fetcher-rejected.change b/changelog.d/oban-fetcher-rejected.change new file mode 100644 index 000000000..92e083647 --- /dev/null +++ b/changelog.d/oban-fetcher-rejected.change @@ -0,0 +1 @@ +Discard Remote Fetcher jobs which errored due to an MRF rejection diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex index ed04c54b2..debbbe012 100644 --- a/lib/pleroma/workers/remote_fetcher_worker.ex +++ b/lib/pleroma/workers/remote_fetcher_worker.ex @@ -13,6 +13,9 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:ok, _object} -> :ok + {:rejected, reason} -> + {:discard, reason} + {:error, :forbidden} -> {:discard, :forbidden} |