From d7d9f406a67419306d992bf906f01232aad59e47 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 25 Sep 2015 14:21:50 +0100
Subject: [PATCH] Bundle some state into invites

---
 api/client-server/v1/sync.yaml        |  5 +++++
 event-schemas/schema/v1/m.room.member | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/api/client-server/v1/sync.yaml b/api/client-server/v1/sync.yaml
index 833c425a..c7f78187 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/v1/sync.yaml
@@ -267,6 +267,11 @@ paths:
                       type: string
                       description: "The user's membership state in this room."
                       enum: ["invite", "join", "leave", "ban"]
+                    invite:
+                        type: object
+                        description: "The invite event if `membership` is `invite`"
+                        allOf:
+                          - "$ref": "room.room.member"
                     messages:
                       type: object
                       title: PaginationChunk
diff --git a/event-schemas/schema/v1/m.room.member b/event-schemas/schema/v1/m.room.member
index 49b9f5b8..32302b85 100644
--- a/event-schemas/schema/v1/m.room.member
+++ b/event-schemas/schema/v1/m.room.member
@@ -32,6 +32,25 @@
         "type": {
             "type": "string",
             "enum": ["m.room.member"]
+        },
+        "invite_room_state": {
+            "type": "array",
+            "description": "A subset of the state of the room at the time of the invite, if ``membership`` is ``invite``",
+            "items": {
+                "type": "object",
+                "title": "StateEvent",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "state_key": {
+                        "type": "string"
+                    },
+                    "content": {
+                        "type": "object"
+                    }
+                }
+            }
         }
     }
 }