summary refs log tree commit diff
path: root/synapse/events/utils.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2015-11-20 15:18:55 +0000
committerRichard van der Hoff <github@rvanderhoff.org.uk>2015-11-20 15:18:55 +0000
commit1d9c1d4166589d029762cd1d52de2fe4c80937f7 (patch)
treec0b3758573863b6170be0dcdd7d3d93df0bb540f /synapse/events/utils.py
parentMerge pull request #391 from matrix-org/erikj/remove_token_from_flow (diff)
parentMerge branch 'develop' into rav/flatten_sync_response (diff)
downloadsynapse-1d9c1d4166589d029762cd1d52de2fe4c80937f7.tar.xz
Merge pull request #389 from matrix-org/rav/flatten_sync_response
v2 sync: Get rid of the event_map, and rename the keys of the rooms obj
Diffstat (limited to 'synapse/events/utils.py')
-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