diff options
| author | feld <feld@feld.me> | 2024-07-21 00:47:10 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-07-21 00:47:10 +0000 |
| commit | e4a6973e0b9ffdb827b71012f0b44ed4d870d56a (patch) | |
| tree | 39000765a5ae25a18bfe60ea00661b038860b034 | |
| parent | 776b069a04ae77a54374fca9714e8d304d93fd19 (diff) | |
| parent | d3c2180181c39fdfd52691ffcaf289b86de20a71 (diff) | |
| download | pleroma-e4a6973e0b9ffdb827b71012f0b44ed4d870d56a.tar.gz pleroma-e4a6973e0b9ffdb827b71012f0b44ed4d870d56a.zip | |
Merge branch 'transmogrifier/handle-non-validate-delete-errors' into 'develop'
Transmogrifier: handle non-validate errors on incoming Delete activities
See merge request pleroma/pleroma!4185
| -rw-r--r-- | changelog.d/handle-non-validate-delete-errors.change | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 3 |
2 files changed, 4 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..2f8a7f8f2 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -530,6 +530,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do else _ -> e end + + e -> + {:error, e} end end |