summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-10 16:36:51 +0000
committerErik Johnston <erik@matrix.org>2015-02-10 16:36:51 +0000
commite8d4a314753bb49f91a2e51d0e442a153f519a64 (patch)
tree5ec8ac87931ac71c34967d2de65db654da0d09a8
parentPin the twisted version so that it doesn't pull in twisted 15. (diff)
downloadsynapse-e8d4a314753bb49f91a2e51d0e442a153f519a64.tar.xz
Fix prune_events to work with nested dicts
-rw-r--r--synapse/events/utils.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 4ad37188ba..5bfa820f96 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -45,12 +45,14 @@ def prune_event(event):
         "membership",
     ]
 
+    event_dict = event.get_dict()
+
     new_content = {}
 
     def add_fields(*fields):
         for field in fields:
             if field in event.content:
-                new_content[field] = event.content[field]
+                new_content[field] = event_dict["content"][field]
 
     if event_type == EventTypes.Member:
         add_fields("membership")
@@ -75,7 +77,7 @@ def prune_event(event):
 
     allowed_fields = {
         k: v
-        for k, v in event.get_dict().items()
+        for k, v in event_dict.items()
         if k in allowed_keys
     }