diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-10-09 19:18:09 +0100 |
| commit | af7b21447648cba477542bc1786be2a6c0928e37 (patch) | |
| tree | 74c4481acd515a180c0edeb05d1a03b52ba30fd6 /synapse/events | |
| parent | Format the presence events correctly for v2 (diff) | |
| parent | Split the sections of EventStreamHandler.get_stream that handle presence (diff) | |
| download | synapse-af7b21447648cba477542bc1786be2a6c0928e37.tar.xz | |
Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api
Diffstat (limited to 'synapse/events')
| -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] |