diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-05 10:33:41 -0500 |
| commit | 58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12 (patch) | |
| tree | 711215f7fe3121b61e7cd32d57ec47cec3ee5671 /synapse/events/utils.py | |
| parent | Implement third party identifier invites (diff) | |
| parent | Add 'trusted_private_chat' to room creation presets (diff) | |
| download | synapse-58e6a58eb7de0c0a8b0f7b30fe02c056a27f0e12.tar.xz | |
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/events/utils.py')
| -rw-r--r-- | synapse/events/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py index 7bd78343f0..b36eec0993 100644 --- a/synapse/events/utils.py +++ b/synapse/events/utils.py @@ -103,7 +103,10 @@ def format_event_raw(d): def format_event_for_client_v1(d): d["user_id"] = d.pop("sender", None) - move_keys = ("age", "redacted_because", "replaces_state", "prev_content") + move_keys = ( + "age", "redacted_because", "replaces_state", "prev_content", + "invite_room_state", + ) for key in move_keys: if key in d["unsigned"]: d[key] = d["unsigned"][key] |