summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-12-01 16:10:24 +0000
committerMark Haines <mjark@negativecurvature.net>2015-12-01 16:10:24 +0000
commitd32db0bc451de121a8f2cdcf6c3a2c9029e821b5 (patch)
tree91b5bc3ea6b04dc3d13bbe58eca72c0a78907687
parentMerge pull request #403 from matrix-org/erikj/search-ts (diff)
parentOnly add the user_id if the sender is present (diff)
downloadsynapse-d32db0bc451de121a8f2cdcf6c3a2c9029e821b5.tar.xz
Merge pull request #402 from matrix-org/markjh/event_formatting
Copy rather than move the fields to shuffle between a v1 and a v2 event.
-rw-r--r--synapse/events/utils.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index 44cc1ef132..e634b149ba 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -100,22 +100,20 @@ def format_event_raw(d):
 
 
 def format_event_for_client_v1(d):
-    d["user_id"] = d.pop("sender", None)
+    d = format_event_for_client_v2(d)
+
+    sender = d.get("sender")
+    if sender is not None:
+        d["user_id"] = sender
 
-    move_keys = (
+    copy_keys = (
         "age", "redacted_because", "replaces_state", "prev_content",
         "invite_room_state",
     )
-    for key in move_keys:
+    for key in copy_keys:
         if key in d["unsigned"]:
             d[key] = d["unsigned"][key]
 
-    drop_keys = (
-        "auth_events", "prev_events", "hashes", "signatures", "depth",
-        "unsigned", "origin", "prev_state"
-    )
-    for key in drop_keys:
-        d.pop(key, None)
     return d