summary refs log tree commit diff
path: root/synapse/api/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-15 17:43:46 +0100
committerErik Johnston <erik@matrix.org>2014-09-15 17:43:46 +0100
commit1e4b971f95ac953e9fbd4a8e4cc0d0d2edc5e5ea (patch)
treebfb15c6b17b54e44957e65bc8f4a5f3ea334aa64 /synapse/api/events
parentFix bug where we incorrectly calculated 'age_ts' from 'age' key rather than t... (diff)
downloadsynapse-1e4b971f95ac953e9fbd4a8e4cc0d0d2edc5e5ea.tar.xz
Fix bug where we didn't always get 'prev_content' key
Diffstat (limited to 'synapse/api/events')
-rw-r--r--synapse/api/events/__init__.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/api/events/__init__.py b/synapse/api/events/__init__.py
index add81ec3e6..a9991e9c94 100644
--- a/synapse/api/events/__init__.py
+++ b/synapse/api/events/__init__.py
@@ -57,6 +57,7 @@ class SynapseEvent(JsonEncodedObject):
         "state_key",
         "required_power_level",
         "age_ts",
+        "prev_content",
     ]
 
     internal_keys = [
@@ -172,10 +173,6 @@ class SynapseEvent(JsonEncodedObject):
 
 class SynapseStateEvent(SynapseEvent):
 
-    valid_keys = SynapseEvent.valid_keys + [
-        "prev_content",
-    ]
-
     def __init__(self, **kwargs):
         if "state_key" not in kwargs:
             kwargs["state_key"] = ""