diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
| commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
| tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/handlers/initial_sync.py | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
| download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz | |
Merge branch 'develop' into travis/login-terms
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 e009395207..563bb3cea3 100644 --- a/synapse/handlers/initial_sync.py +++ b/synapse/handlers/initial_sync.py @@ -156,7 +156,7 @@ class InitialSyncHandler(BaseHandler): room_end_token = "s%d" % (event.stream_ordering,) deferred_room_state = run_in_background( self.store.get_state_for_events, - [event.event_id], None, + [event.event_id], ) deferred_room_state.addCallback( lambda states: states[event.event_id] @@ -301,7 +301,7 @@ class InitialSyncHandler(BaseHandler): def _room_initial_sync_parted(self, user_id, room_id, pagin_config, membership, member_event_id, is_peeking): room_state = yield self.store.get_state_for_events( - [member_event_id], None + [member_event_id], ) room_state = room_state[member_event_id] |