From 84f235aea47e2d2f9875f7334d8497660320f55e Mon Sep 17 00:00:00 2001
From: Eric Eastwood <erice@element.io>
Date: Mon, 8 Nov 2021 21:21:10 -0600
Subject: [PATCH] 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
---
 changelog.d/11244.misc                       | 1 +
 synapse/handlers/message.py                  | 2 +-
 synapse/rest/client/room_batch.py            | 2 +-
 synapse/storage/databases/main/room_batch.py | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/11244.misc

diff --git a/changelog.d/11244.misc b/changelog.d/11244.misc
new file mode 100644
index 000000000000..c6e65df97f90
--- /dev/null
+++ b/changelog.d/11244.misc
@@ -0,0 +1 @@
+Fix [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) historical messages backfilling in random order on remote homeservers.
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index b7bc187169dc..d4c2a6ab7a7d 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -1507,7 +1507,7 @@ async def persist_and_notify_client_event(
                 conflicting_insertion_event_id = None
                 if 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
                         )
                     )
diff --git a/synapse/rest/client/room_batch.py b/synapse/rest/client/room_batch.py
index 46f033eee2f7..e4c9451ae06a 100644
--- a/synapse/rest/client/room_batch.py
+++ b/synapse/rest/client/room_batch.py
@@ -112,7 +112,7 @@ async def on_POST(
         # and have the batch connected.
         if batch_id_from_query:
             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
                 )
             )
diff --git a/synapse/storage/databases/main/room_batch.py b/synapse/storage/databases/main/room_batch.py
index dcbce8fdcf03..97b261843782 100644
--- a/synapse/storage/databases/main/room_batch.py
+++ b/synapse/storage/databases/main/room_batch.py
@@ -18,7 +18,7 @@
 
 
 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
     ) -> Optional[str]:
         """Retrieve a insertion event ID.