summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-03-05 06:37:59 +0000
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2023-03-30 12:43:58 +0200
commit22b72cd6b87b4a684bde9c34741e5bb1e1204ed0 (patch)
tree12cb508c458614004a2d60cf15bf06ee4a0e27a9 /lib
parentfd46f83d2daca51055633875671e5fa41e454ca4 (diff)
downloadpleroma-22b72cd6b87b4a684bde9c34741e5bb1e1204ed0.tar.gz
pleroma-22b72cd6b87b4a684bde9c34741e5bb1e1204ed0.zip
Merge branch 'tusooa/oban-common-pipeline' into 'develop'
Stop oban from retrying if validating errors occur when processing incoming data See merge request pleroma/pleroma!3844
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/workers/receiver_worker.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
index 4f513b907..cf1bb62b4 100644
--- a/lib/pleroma/workers/receiver_worker.ex
+++ b/lib/pleroma/workers/receiver_worker.ex
@@ -13,6 +13,9 @@ defmodule Pleroma.Workers.ReceiverWorker do
{:ok, res}
else
{:error, :origin_containment_failed} -> {:cancel, :origin_containment_failed}
+ {:error, :already_present} -> {:cancel, :already_present}
+ {:error, {:validate_object, reason}} -> {:cancel, reason}
+ {:error, {:error, {:validate, reason}}} -> {:cancel, reason}
{:error, {:reject, reason}} -> {:cancel, reason}
e -> e
end