diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-04 11:56:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-04 11:56:40 +0100 |
| commit | bf14883a04c702a553cc81b3f4ee66608be663fa (patch) | |
| tree | f29ab95ef6fab9ef87a7f7f67226ad472474262c /synapse/state.py | |
| parent | Merge pull request #686 from matrix-org/markjh/doc_strings (diff) | |
| parent | Use computed prev event ids (diff) | |
| download | synapse-bf14883a04c702a553cc81b3f4ee66608be663fa.tar.xz | |
Merge pull request #689 from matrix-org/erikj/member
Do checks for memberships before creating events
Diffstat (limited to 'synapse/state.py')
| -rw-r--r-- | synapse/state.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/state.py b/synapse/state.py index 1bca0f8f78..58211f5feb 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -75,7 +75,8 @@ class StateHandler(object): self._state_cache.start() @defer.inlineCallbacks - def get_current_state(self, room_id, event_type=None, state_key=""): + def get_current_state(self, room_id, event_type=None, state_key="", + latest_event_ids=None): """ Retrieves the current state for the room. This is done by calling `get_latest_events_in_room` to get the leading edges of the event graph and then resolving any of the state conflicts. @@ -89,9 +90,10 @@ class StateHandler(object): Returns: map from (type, state_key) to event """ - event_ids = yield self.store.get_latest_event_ids_in_room(room_id) + if not latest_event_ids: + latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id) - res = yield self.resolve_state_groups(room_id, event_ids) + res = yield self.resolve_state_groups(room_id, latest_event_ids) state = res[1] if event_type: |