summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTusooa Zhu <tusooa@kazv.moe>2022-08-08 08:41:33 -0400
committerTusooa Zhu <tusooa@kazv.moe>2022-08-08 08:41:33 -0400
commitd487e0160cdc4cdf84c45e4c64f6589b317479cc (patch)
treef8f86eec6c1af1ecbb7d4d0bf207ef902ae3b60f
parent88e0e6acd5cc5f84256c531093a8cebee8b79786 (diff)
Treat containment failure as cancel in ReceiverWorker
-rw-r--r--lib/pleroma/workers/receiver_worker.ex1
-rw-r--r--test/pleroma/web/federator_test.exs2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/workers/receiver_worker.ex b/lib/pleroma/workers/receiver_worker.ex
index 309e197dc..c41b44e14 100644
--- a/lib/pleroma/workers/receiver_worker.ex
+++ b/lib/pleroma/workers/receiver_worker.ex
@@ -12,6 +12,7 @@ defmodule Pleroma.Workers.ReceiverWorker do
with {:ok, res} <- Federator.perform(:incoming_ap_doc, params) do
{:ok, res}
else
+ {:error, :origin_containment_failed} -> {:cancel, :origin_containment_failed}
{:error, {:reject, reason}} -> {:cancel, reason}
e -> e
end
diff --git a/test/pleroma/web/federator_test.exs b/test/pleroma/web/federator_test.exs
index 20ac631f7..41d1c5d5e 100644
--- a/test/pleroma/web/federator_test.exs
+++ b/test/pleroma/web/federator_test.exs
@@ -153,7 +153,7 @@ defmodule Pleroma.Web.FederatorTest do
}
assert {:ok, job} = Federator.incoming_ap_doc(params)
- assert {:error, :origin_containment_failed} = ObanHelpers.perform(job)
+ assert {:cancel, :origin_containment_failed} = ObanHelpers.perform(job)
end
test "it does not crash if MRF rejects the post" do