Skip to content

Commit c339021

Browse files
authored
Reduce strictness of delayed event delta fetching (#18858)
1 parent 499f947 commit c339021

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

changelog.d/18858.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Do not throw an error when fetching a rejected delayed state event on startup.

synapse/handlers/delayed_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ async def _handle_state_deltas(self, deltas: List[StateDelta]) -> None:
215215
"Handling: %r %r, %s", delta.event_type, delta.state_key, delta.event_id
216216
)
217217

218-
event = await self._store.get_event(
219-
delta.event_id, check_room_id=delta.room_id
220-
)
218+
event = await self._store.get_event(delta.event_id, allow_none=True)
219+
if not event:
220+
continue
221221
sender = UserID.from_string(event.sender)
222222

223223
next_send_ts = await self._store.cancel_delayed_state_events(

0 commit comments

Comments
 (0)