diff options
| author | Mark Felder <feld@feld.me> | 2023-12-27 22:28:41 -0500 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2023-12-27 22:28:41 -0500 |
| commit | ad0a5deb67f454b0529a4faf72399cd9ecc9c0e6 (patch) | |
| tree | 782f655773adda6b71cbbd7399aa6a05383f5134 /lib | |
| parent | a2708f7fe31c6009b0c9954e5de3b74c45f9818f (diff) | |
| download | pleroma-ad0a5deb67f454b0529a4faf72399cd9ecc9c0e6.tar.gz pleroma-ad0a5deb67f454b0529a4faf72399cd9ecc9c0e6.zip | |
Prevent requeuing Remote Fetcher jobs that exceed thread depth
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/object/fetcher.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/workers/remote_fetcher_worker.ex | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex index 0c90e0eaa..972dfaf28 100644 --- a/lib/pleroma/object/fetcher.ex +++ b/lib/pleroma/object/fetcher.ex @@ -74,7 +74,7 @@ defmodule Pleroma.Object.Fetcher do else {:allowed_depth, false} = e -> log_fetch_error(id, e) - {:error, "Max thread distance exceeded."} + {:error, :allowed_depth} {:containment, reason} = e -> log_fetch_error(id, e) diff --git a/lib/pleroma/workers/remote_fetcher_worker.ex b/lib/pleroma/workers/remote_fetcher_worker.ex index dca4530d7..fef8a26b2 100644 --- a/lib/pleroma/workers/remote_fetcher_worker.ex +++ b/lib/pleroma/workers/remote_fetcher_worker.ex @@ -21,6 +21,9 @@ defmodule Pleroma.Workers.RemoteFetcherWorker do {:error, :not_found} -> {:cancel, :not_found} + {:error, :allowed_depth} -> + {:cancel, :allowed_depth} + _ -> :error end |