diff options
Diffstat (limited to '')
| -rw-r--r-- | synapse/events/utils.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 44cc1ef132..666df54114 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -100,22 +100,18 @@ 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) + + d["user_id"] = d.get("sender", None) - 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 |