diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-08-06 10:52:50 +0100 |
| commit | 118a9eafb31fbd51d23ef8abbaac481579b7f9e5 (patch) | |
| tree | ba84cd874fbe43c4981abaa3d8aa2c9913d5097b /synapse/handlers/initial_sync.py | |
| parent | Incorporate review (diff) | |
| parent | Fixup worker doc (again) (#8000) (diff) | |
| download | synapse-118a9eafb31fbd51d23ef8abbaac481579b7f9e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
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 f88bad5f25..ae6bd1d352 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -109,7 +109,7 @@ class InitialSyncHandler(BaseHandler): rooms_ret = [] - now_token = await self.hs.get_event_sources().get_current_token() + now_token = self.hs.get_event_sources().get_current_token() presence_stream = self.hs.get_event_sources().sources["presence"] pagination_config = PaginationConfig(from_token=now_token) @@ -360,7 +360,7 @@ class InitialSyncHandler(BaseHandler): current_state.values(), time_now ) - now_token = await self.hs.get_event_sources().get_current_token() + now_token = self.hs.get_event_sources().get_current_token() limit = pagin_config.limit if pagin_config else None if limit is None: |