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 1/5] 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"
+                    }
+                }
+            }
         }
     }
 }

From 37ccddb3087283067617a94d83dc968489bae20f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 25 Sep 2015 14:25:07 +0100
Subject: [PATCH 2/5] Typo

---
 api/client-server/v1/sync.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/client-server/v1/sync.yaml b/api/client-server/v1/sync.yaml
index c7f78187..d82ee9e4 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/v1/sync.yaml
@@ -271,7 +271,7 @@ paths:
                         type: object
                         description: "The invite event if `membership` is `invite`"
                         allOf:
-                          - "$ref": "room.room.member"
+                          - "$ref": "m.room.member"
                     messages:
                       type: object
                       title: PaginationChunk

From 8c22b715cabdb283de39a0f79bdef71847366323 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 28 Sep 2015 09:29:07 +0100
Subject: [PATCH 3/5] Add title

---
 api/client-server/v1/sync.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/client-server/v1/sync.yaml b/api/client-server/v1/sync.yaml
index d82ee9e4..dbfa39b8 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/v1/sync.yaml
@@ -269,6 +269,7 @@ paths:
                       enum: ["invite", "join", "leave", "ban"]
                     invite:
                         type: object
+                        title: "InviteEvent"
                         description: "The invite event if `membership` is `invite`"
                         allOf:
                           - "$ref": "m.room.member"

From 50e1b4c3a7147cb2a03fab56ff0403b998ef559e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 29 Sep 2015 09:17:33 +0100
Subject: [PATCH 4/5] Fix up rst

---
 api/client-server/v1/sync.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/client-server/v1/sync.yaml b/api/client-server/v1/sync.yaml
index dbfa39b8..8fe30056 100644
--- a/api/client-server/v1/sync.yaml
+++ b/api/client-server/v1/sync.yaml
@@ -270,9 +270,9 @@ paths:
                     invite:
                         type: object
                         title: "InviteEvent"
-                        description: "The invite event if `membership` is `invite`"
+                        description: "The invite event if ``membership`` is ``invite``"
                         allOf:
-                          - "$ref": "m.room.member"
+                          - "$ref": "v1-event-schema/m.room.member"
                     messages:
                       type: object
                       title: PaginationChunk

From 9964dd1401ac0127a8476b14106274c9d84d0fbd Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 30 Sep 2015 16:11:31 +0100
Subject: [PATCH 5/5] Make explicit the state event only includes some keys

---
 event-schemas/schema/v1/m.room.member | 1 +
 1 file changed, 1 insertion(+)

diff --git a/event-schemas/schema/v1/m.room.member b/event-schemas/schema/v1/m.room.member
index 32302b85..c0fb103c 100644
--- a/event-schemas/schema/v1/m.room.member
+++ b/event-schemas/schema/v1/m.room.member
@@ -39,6 +39,7 @@
             "items": {
                 "type": "object",
                 "title": "StateEvent",
+                "description": "A stripped down state event, with only the ``type``, ``state_key`` and ``content`` keys.",
                 "properties": {
                     "type": {
                         "type": "string"