diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-01-07 02:23:37 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-07 02:23:37 +0000 |
| commit | 8c48971b510e441e2e90adb6ea84cb1e600a70c2 (patch) | |
| tree | d10bf2a3da70948a17896bf43558840d27461930 /synapse/state.py | |
| parent | Merge branch 'release-v0.18.6' into develop (diff) | |
| parent | Discard PDUs from invalid origins due to #1753 in 0.18.[56] (diff) | |
| download | synapse-8c48971b510e441e2e90adb6ea84cb1e600a70c2.tar.xz | |
Merge branch 'release-v0.18.7' into develop
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py index ba0d2a39ac..8003099c88 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -160,9 +160,9 @@ class StateHandler(object): @defer.inlineCallbacks def get_current_user_in_room(self, room_id, latest_event_ids=None): - logger.info("calling resolve_state_groups from get_current_user_in_room") if not latest_event_ids: latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) + logger.info("calling resolve_state_groups from get_current_user_in_room") entry = yield self.resolve_state_groups(room_id, latest_event_ids) joined_users = yield self.store.get_joined_users_from_state( room_id, entry.state_id, entry.state |