summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorSpiritCroc <dev@spiritcroc.de>2024-03-21 19:43:07 +0100
committerGitHub <noreply@github.com>2024-03-21 18:43:07 +0000
commit9ad49e7ecf2fb489fb66445b9aed8489ee8f2a6d (patch)
tree65914a111b878f902eb3cb8cc2e5056a568bbd61 /synapse/handlers
parentFix reject knocks on deactivating account (#17010) (diff)
downloadsynapse-9ad49e7ecf2fb489fb66445b9aed8489ee8f2a6d.tar.xz
Do not refuse to set read_marker if previous event_id is in wrong room (#16990)
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/read_marker.py4
1 files changed, 2 insertions, 2 deletions
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