From 9ad49e7ecf2fb489fb66445b9aed8489ee8f2a6d Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 21 Mar 2024 19:43:07 +0100 Subject: Do not refuse to set read_marker if previous event_id is in wrong room (#16990) --- synapse/handlers/read_marker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/handlers') diff --git a/synapse/handlers/read_marker.py b/synapse/handlers/read_marker.py index 135a662267..fb39c8e04b 100644 --- a/synapse/handlers/read_marker.py +++ b/synapse/handlers/read_marker.py @@ -55,12 +55,12 @@ class ReadMarkerHandler: should_update = True # Get event ordering, this also ensures we know about the event - event_ordering = await self.store.get_event_ordering(event_id) + event_ordering = await self.store.get_event_ordering(event_id, room_id) if existing_read_marker: try: old_event_ordering = await self.store.get_event_ordering( - existing_read_marker["event_id"] + existing_read_marker["event_id"], room_id ) except SynapseError: # Old event no longer exists, assume new is ahead. This may -- cgit 1.5.1