summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-04-27 17:36:30 +0100
committerGitHub <noreply@github.com>2017-04-27 17:36:30 +0100
commit25a96e0c63e8499c77c54fac7663423a613a97e1 (patch)
tree489b3d50df4781636d798e5b7b6317cbdee0ecef /synapse/rest
parentMerge pull request #2127 from APwhitehat/alreadystarted (diff)
parentComment and remove spurious logging (diff)
downloadsynapse-25a96e0c63e8499c77c54fac7663423a613a97e1.tar.xz
Merge pull request #2163 from matrix-org/erikj/fix_invite_state
Fix invite state to always include all events
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index a7a9e0a794..f30eab76fd 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -253,6 +253,7 @@ class SyncRestServlet(RestServlet):
             invite = serialize_event(
                 room.invite, time_now, token_id=token_id,
                 event_format=format_event_for_client_v2_without_room_id,
+                is_invite=True,
             )
             unsigned = dict(invite.get("unsigned", {}))
             invite["unsigned"] = unsigned