From 924c1bfd0eb9d4297526a9b4430ffbbf1835dc5c Mon Sep 17 00:00:00 2001
From: Olivier 'reivilibre <oliverw@matrix.org>
Date: Wed, 3 Sep 2025 13:46:21 +0100
Subject: [PATCH] Use copy_and_replace in get_current_token_for_pagination

---
 synapse/streams/events.py | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/synapse/streams/events.py b/synapse/streams/events.py
index 63c2a2d4cb..1e4bebe46d 100644
--- a/synapse/streams/events.py
+++ b/synapse/streams/events.py
@@ -33,7 +33,6 @@ from synapse.logging.opentracing import trace
 from synapse.streams import EventSource
 from synapse.types import (
     AbstractMultiWriterStreamToken,
-    MultiWriterStreamToken,
     StreamKeyType,
     StreamToken,
 )
@@ -198,17 +197,7 @@ class EventSources:
         Returns:
             The current token for pagination.
         """
-        token = StreamToken(
-            room_key=await self.sources.room.get_current_key_for_room(room_id),
-            presence_key=0,
-            typing_key=0,
-            receipt_key=MultiWriterStreamToken(stream=0),
-            account_data_key=0,
-            push_rules_key=0,
-            to_device_key=0,
-            device_list_key=MultiWriterStreamToken(stream=0),
-            groups_key=0,
-            un_partial_stated_rooms_key=0,
-            thread_subscriptions_key=0,
+        return StreamToken.START.copy_and_replace(
+            StreamKeyType.ROOM,
+            await self.sources.room.get_current_key_for_room(room_id),
         )
-        return token