diff options
| author | Erik Johnston <erikj@jki.re> | 2018-08-22 10:04:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 10:04:55 +0100 |
| commit | 3bf8bab8f9d9bbdf225361adc66a97fdf4ae3fcd (patch) | |
| tree | e43a5df4670f4da60604e5cc03e507db4efd99ad /synapse/storage | |
| parent | Merge pull request #3735 from matrix-org/travis/federation-spelling (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_s... (diff) | |
| download | synapse-3bf8bab8f9d9bbdf225361adc66a97fdf4ae3fcd.tar.xz | |
Merge pull request #3673 from matrix-org/erikj/refactor_state_handler
Refactor state module to support multiple room versions
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/events.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 025a7fb6d9..f39c8c8461 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -705,9 +705,11 @@ class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore } events_map = {ev.event_id: ev for ev, _ in events_context} + room_version = yield self.get_room_version(room_id) + logger.debug("calling resolve_state_groups from preserve_events") res = yield self._state_resolution_handler.resolve_state_groups( - room_id, state_groups, events_map, get_events + room_id, room_version, state_groups, events_map, get_events ) defer.returnValue((res.state, None)) |