diff options
author | Erik Johnston <erik@matrix.org> | 2020-09-11 12:22:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-11 12:22:55 +0100 |
commit | fe8ed1b46f781faa45d1bba8f9308cf47c42010f (patch) | |
tree | 10d5b3cb181a70bd690a6e53461db5de394d9a4b /synapse/handlers/initial_sync.py | |
parent | Use TLSv1.2 for fake servers in tests (#8208) (diff) | |
download | synapse-fe8ed1b46f781faa45d1bba8f9308cf47c42010f.tar.xz |
Make `StreamToken.room_key` be a `RoomStreamToken` instance. (#8281)
Diffstat (limited to 'synapse/handlers/initial_sync.py')
-rw-r--r-- | synapse/handlers/initial_sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/initial_sync.py b/synapse/handlers/initial_sync.py index ddb8f0712b..ba4828c713 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -25,7 +25,7 @@ from synapse.handlers.presence import format_user_presence_state from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.storage.roommember import RoomsForUser from synapse.streams.config import PaginationConfig -from synapse.types import JsonDict, Requester, StreamToken, UserID +from synapse.types import JsonDict, Requester, RoomStreamToken, StreamToken, UserID from synapse.util import unwrapFirstError from synapse.util.async_helpers import concurrently_execute from synapse.util.caches.response_cache import ResponseCache @@ -167,7 +167,7 @@ class InitialSyncHandler(BaseHandler): self.state_handler.get_current_state, event.room_id ) elif event.membership == Membership.LEAVE: - room_end_token = "s%d" % (event.stream_ordering,) + room_end_token = RoomStreamToken(None, event.stream_ordering,) deferred_room_state = run_in_background( self.state_store.get_state_for_events, [event.event_id] ) |