summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2021-10-29 02:43:08 -0500
committerEric Eastwood <erice@element.io>2021-10-29 02:43:08 -0500
commit5afc264dd54221142b0acd0a56cbe07c3eac2113 (patch)
tree848bb1334a15ad6f54fc32af351b35a20a583a95 /synapse/handlers/message.py
parentRevert "WIP: Don't include the event we branch from" (diff)
downloadsynapse-5afc264dd54221142b0acd0a56cbe07c3eac2113.tar.xz
WIP: Sort events topologically when we receive them over backfill
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py

index d6f0b99f58..2f4b458d45 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py
@@ -1511,7 +1511,7 @@ class EventCreationHandler: EventContentFields.MSC2716_NEXT_BATCH_ID ) conflicting_insertion_event_id = ( - await self.store.get_insertion_event_by_batch_id( + await self.store.get_insertion_event_id_by_batch_id( event.room_id, next_batch_id ) )