diff options
| author | Erik Johnston <erik@matrix.org> | 2015-10-02 11:15:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-10-02 11:15:43 +0100 |
| commit | a086b7aa003a53562f00dda9e655a6a48f39b259 (patch) | |
| tree | 465ef56e76ea054e48e57bec0abddeae08a94fd7 /synapse/events | |
| parent | Merge pull request #279 from matrix-org/erikj/unfederatable (diff) | |
| parent | Also bundle in sender (diff) | |
| download | synapse-a086b7aa003a53562f00dda9e655a6a48f39b259.tar.xz | |
Merge pull request #275 from matrix-org/erikj/invite_state
Bundle in some room state in invites.
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] |