summary refs log tree commit diff
path: root/synapse/api/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-25 11:31:18 +0000
committerErik Johnston <erik@matrix.org>2014-11-25 17:59:49 +0000
commit64fc859dac122a44a753eafe015a453085e6e9a8 (patch)
tree056658b4941cbc6a32159d4e86c455c0e6a8efe4 /synapse/api/events
parentDon't double url-decode state event types. (diff)
downloadsynapse-64fc859dac122a44a753eafe015a453085e6e9a8.tar.xz
Fix bugs in invite/join dances.
We now do more implement more of the auth on the events so that we
don't reject valid events.
Diffstat (limited to 'synapse/api/events')
-rw-r--r--synapse/api/events/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py
index 8a35b4cb7d..22939d011a 100644
--- a/synapse/api/events/__init__.py
+++ b/synapse/api/events/__init__.py
@@ -125,6 +125,7 @@ class SynapseEvent(JsonEncodedObject):
         pdu_json.pop("outlier", None)
         pdu_json.pop("replaces_state", None)
         pdu_json.pop("redacted", None)
+        pdu_json.pop("prev_content", None)
         state_hash = pdu_json.pop("state_hash", None)
         if state_hash is not None:
             pdu_json.setdefault("unsigned", {})["state_hash"] = state_hash