From 2205aba3ed1337a00f9f7869db8a164b65b68f81 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sat, 6 Sep 2014 07:41:36 +0100
Subject: [PATCH] Fix bug where we used an event_id as a pdu_id
---
synapse/state.py | 8 +++++---
1 file 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
--
GitLab