summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMint <mint@plagu.ee>2024-07-18 18:00:40 +0300
committerMint <mint@plagu.ee>2024-07-18 18:04:32 +0300
commit1f3ac66844e3a5f3e85aa0fb2afd23a2bc706f8b (patch)
treee9ce4969d9d595050e3ef1068ec71e3317b91429
parentc45ee5fc820573f120d7790b342f64f6c77fdf35 (diff)
downloadpleroma-1f3ac66844e3a5f3e85aa0fb2afd23a2bc706f8b.tar.gz
pleroma-1f3ac66844e3a5f3e85aa0fb2afd23a2bc706f8b.zip
Transmogrifier: handle non-validate errors on incoming Delete activities
This should fix WithClauseError resulting in Oban jobs for processing incoming deletes being retried without getting cancelled when those deletes are MRF rejected.
-rw-r--r--changelog.d/handle-non-validate-delete-errors.change1
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/handle-non-validate-delete-errors.change b/changelog.d/handle-non-validate-delete-errors.change
new file mode 100644
index 000000000..94adb0e98
--- /dev/null
+++ b/changelog.d/handle-non-validate-delete-errors.change
@@ -0,0 +1 @@
+Transmogrifier: handle non-validate errors on incoming Delete activities
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 4d851559f..9b6ecb3a9 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -530,6 +530,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
else
_ -> e
end
+ e -> {:error, e}
end
end