summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-06 07:41:36 +0100
committerErik Johnston <erik@matrix.org>2014-09-06 07:41:51 +0100
commit2205aba3ed1337a00f9f7869db8a164b65b68f81 (patch)
treec55c47614aa2554d61b09bf37b254df6cf07a13e
parentUnit tests do not need captchas. (diff)
downloadsynapse-2205aba3ed1337a00f9f7869db8a164b65b68f81.tar.xz
Fix bug where we used an event_id as a pdu_id
Diffstat (limited to '')
-rw-r--r--synapse/state.py8
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