diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-10 14:25:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-10 14:25:54 +0100 |
| commit | 49ae42bbe1176b9061c17cf7e3829008f608c0a4 (patch) | |
| tree | d233638a43fc49eae6cadacf7b6df5055096c250 /synapse/events | |
| parent | Merge pull request #274 from matrix-org/add_threepid_fix (diff) | |
| download | synapse-49ae42bbe1176b9061c17cf7e3829008f608c0a4.tar.xz | |
Bundle in some room state in the unsigned bit of the invite when sending to invited servers
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] |