1 files changed, 31 insertions, 0 deletions
diff --git a/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch b/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch
new file mode 100644
index 0000000..3d5ea60
--- /dev/null
+++ b/packages/overlays/matrix-synapse/patches/0002-Hotfix-ignore-rejected-events-in-delayed_events.patch
@@ -0,0 +1,31 @@
+From 346fb5899fa42d4604b7bf0261c5e1774e6d2c04 Mon Sep 17 00:00:00 2001
+From: Rory& <root@rory.gay>
+Date: Sun, 20 Apr 2025 00:30:29 +0200
+Subject: [PATCH 02/11] Hotfix: ignore rejected events in delayed_events
+
+---
+ synapse/handlers/delayed_events.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/synapse/handlers/delayed_events.py b/synapse/handlers/delayed_events.py
+index 80cb1cec9b..cb2a34ff73 100644
+--- a/synapse/handlers/delayed_events.py
++++ b/synapse/handlers/delayed_events.py
+@@ -208,8 +208,13 @@ class DelayedEventsHandler:
+             )
+ 
+             event = await self._store.get_event(
+-                delta.event_id, check_room_id=delta.room_id
++                delta.event_id, check_room_id=delta.room_id, allow_rejected=True, allow_none=True
+             )
++
++            if event is None or event.rejected_reason is not None:
++                # This event has been rejected, so we don't want to cancel any delayed events for it.
++                continue
++
+             sender = UserID.from_string(event.sender)
+ 
+             next_send_ts = await self._store.cancel_delayed_state_events(
+-- 
+2.49.0
+