diff options
| author | Erik Johnston <erikj@jki.re> | 2017-01-23 16:14:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:14:34 +0000 |
| commit | f5b46482f4139f515393bb2293e74146433876b2 (patch) | |
| tree | c021d42bffb199275b94583f85fc69082b99b571 /synapse/handlers | |
| parent | Merge pull request #1836 from matrix-org/erikj/current_state_fix (diff) | |
| parent | Refactor to calculate state delta outside transaction (diff) | |
| download | synapse-f5b46482f4139f515393bb2293e74146433876b2.tar.xz | |
Merge pull request #1840 from matrix-org/erikj/current_state_fix
Insert delta of current_state_events to be more efficient
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/_base.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 90f96209f8..e83adc8339 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -88,9 +88,13 @@ class BaseHandler(object): current_state = yield self.store.get_events( context.current_state_ids.values() ) - current_state = current_state.values() else: - current_state = yield self.store.get_current_state(event.room_id) + current_state = yield self.state_handler.get_current_state( + event.room_id + ) + + current_state = current_state.values() + logger.info("maybe_kick_guest_users %r", current_state) yield self.kick_guest_users(current_state) |