diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
| commit | d12feed6235ec91e9797a47c98e9da162b6559c9 (patch) | |
| tree | 57f47c24ee7a402f210d7cb07f08521dfba6867c /synapse/state.py | |
| parent | Minor spec tweaks. (diff) | |
| parent | Center recaptcha dialog. (diff) | |
| download | synapse-d12feed6235ec91e9797a47c98e9da162b6559c9.tar.xz | |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2
Diffstat (limited to '')
| -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 36d8210eb5..5dcff27367 100644 --- a/synapse/state.py +++ b/synapse/state.py @@ -16,7 +16,7 @@ from twisted.internet import defer -from synapse.federation.pdu_codec import encode_event_id +from synapse.federation.pdu_codec import encode_event_id, decode_event_id from synapse.util.logutils import log_function from collections import namedtuple @@ -87,9 +87,11 @@ class StateHandler(object): # than the power level of the user # power_level = self._get_power_level_for_event(event) + pdu_id, origin = decode_event_id(event.event_id, self.server_name) + yield self.store.update_current_state( - pdu_id=event.event_id, - origin=self.server_name, + pdu_id=pdu_id, + origin=origin, context=key.context, pdu_type=key.type, state_key=key.state_key |