summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-02 11:15:43 +0100
committerErik Johnston <erik@matrix.org>2015-10-02 11:15:43 +0100
commita086b7aa003a53562f00dda9e655a6a48f39b259 (patch)
tree465ef56e76ea054e48e57bec0abddeae08a94fd7 /synapse/events
parentMerge pull request #279 from matrix-org/erikj/unfederatable (diff)
parentAlso bundle in sender (diff)
downloadsynapse-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.py5
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]