logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 3754713599e474754f3d4c07221a88352be8c018
parent 680da772e7397af122d8fbd822e99fb3382d37c8
Author: feld <feld@feld.me>
Date:   Fri, 12 Jul 2024 14:56:55 +0000

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

Diffstat:

Achangelog.d/oban-fetcher-rejected.change1+
Mlib/pleroma/workers/remote_fetcher_worker.ex3+++
2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/changelog.d/oban-fetcher-rejected.change 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 @@ -13,6 +13,9 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:ok, _object} -> :ok + {:rejected, reason} -> + {:discard, reason} + {:error, :forbidden} -> {:discard, :forbidden}