OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename to more clear `get_insertion_event_id_by_batch_id` (MSC2716) (#11244) 

`get_insertion_event_by_batch_id` -> `get_insertion_event_id_by_batch_id`

Split out from https://github.com/matrix-org/synapse/pull/11114
pull/11281/head
Eric Eastwood 2021-11-08 21:21:10 -06:00 committed by GitHub
parent 4ee71b9637
commit 84f235aea4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11244.misc Normal file
View File

@ -0,0 +1 @@
Fix [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) historical messages backfilling in random order on remote homeservers.

2
synapse/handlers/message.py
View File

@ -1507,7 +1507,7 @@ class EventCreationHandler:
conflicting_insertion_event_id = None conflicting_insertion_event_id = None
if next_batch_id: if next_batch_id:
conflicting_insertion_event_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 event.room_id, next_batch_id
) )
) )

2
synapse/rest/client/room_batch.py
View File

@ -112,7 +112,7 @@ class RoomBatchSendEventRestServlet(RestServlet):
# and have the batch connected. # and have the batch connected.
if batch_id_from_query: if batch_id_from_query:
corresponding_insertion_event_id = ( corresponding_insertion_event_id = (
await self.store.get_insertion_event_by_batch_id( await self.store.get_insertion_event_id_by_batch_id(
room_id, batch_id_from_query room_id, batch_id_from_query
) )
) )

2
synapse/storage/databases/main/room_batch.py
View File

@ -18,7 +18,7 @@ from synapse.storage._base import SQLBaseStore
class RoomBatchStore(SQLBaseStore): class RoomBatchStore(SQLBaseStore):
async def get_insertion_event_by_batch_id( async def get_insertion_event_id_by_batch_id(
self, room_id: str, batch_id: str self, room_id: str, batch_id: str
) -> Optional[str]: ) -> Optional[str]:
"""Retrieve a insertion event ID. """Retrieve a insertion event ID.