logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: e4a6973e0b9ffdb827b71012f0b44ed4d870d56a
parent 776b069a04ae77a54374fca9714e8d304d93fd19
Author: feld <feld@feld.me>
Date:   Sun, 21 Jul 2024 00:47:10 +0000

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

Diffstat:

Achangelog.d/handle-non-validate-delete-errors.change1+
Mlib/pleroma/web/activity_pub/transmogrifier.ex3+++
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 @@ -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 @@ -530,6 +530,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do else _ -> e end + + e -> + {:error, e} end end