diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:30:17 -0500 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-10-06 09:30:17 -0500 |
| commit | 287c81abf3c5b4bc01b4bf9c415b8ed939413c41 (patch) | |
| tree | 013f1ce57cdaae78ae6d0ddf0ef7593ff63de5fa /synapse/events/utils.py | |
| parent | Preserve version string in user agent (diff) | |
| parent | Explicitly add Create event as auth event (diff) | |
| download | synapse-287c81abf3c5b4bc01b4bf9c415b8ed939413c41.tar.xz | |
Merge branch 'develop' into daniel/useragent
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] |