summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2015-11-12 10:33:19 +0000
committerRichard van der Hoff <richard@matrix.org>2015-11-19 10:51:11 +0000
commit3c3fc6b26875fc69fad4f5983fded5d45d30ec83 (patch)
treefb1ce310744be14768ad160a1550e98c2714ab0d /synapse/events
parentMerge pull request #381 from matrix-org/daniel/jenkins-sytest-cached (diff)
downloadsynapse-3c3fc6b26875fc69fad4f5983fded5d45d30ec83.tar.xz
Flatten the /sync response to remove the event_map
Diffstat (limited to 'synapse/events')
-rw-r--r--synapse/events/utils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 9989b76591..44cc1ef132 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -129,10 +129,9 @@ def format_event_for_client_v2(d):
     return d
 
 
-def format_event_for_client_v2_without_event_id(d):
+def format_event_for_client_v2_without_room_id(d):
     d = format_event_for_client_v2(d)
     d.pop("room_id", None)
-    d.pop("event_id", None)
     return d