From d279fdafa6e649f4dd8ea2dd4a89e559c633a3f3 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 15:49:16 -0600
Subject: [PATCH 1/4] Document the server_name query parameter on
 /join/{roomIdOrAlias}

Fixes https://github.com/matrix-org/matrix-doc/issues/904
---
 api/client-server/joining.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/api/client-server/joining.yaml b/api/client-server/joining.yaml
index da4e4337..bd3e6885 100644
--- a/api/client-server/joining.yaml
+++ b/api/client-server/joining.yaml
@@ -143,6 +143,16 @@ paths:
           description: The room identifier or alias to join.
           required: true
           x-example: "#monkeys:matrix.org"
+        - in: query
+          type: array
+          items:
+            type: string
+          explode: true
+          name: server_name
+          description: |-
+            The servers to attempt to join the room through. One of the servers
+            must be participating in the room.
+          x-example: ["matrix.org", "elsewhere.ca"]
         - in: body
           name: third_party_signed
           schema:

From cbbdcbcf01cd5c9d18bb0ca0aa80257dad8fccfe Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 15:50:01 -0600
Subject: [PATCH 2/4] Show arrays in the query string as "[type]" rather than
 "array"

Otherwise the question "array of what?" is raised.
---
 scripts/templating/matrix_templates/units.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/templating/matrix_templates/units.py b/scripts/templating/matrix_templates/units.py
index d8cfe1e3..dac183d1 100644
--- a/scripts/templating/matrix_templates/units.py
+++ b/scripts/templating/matrix_templates/units.py
@@ -502,6 +502,11 @@ class MatrixUnits(Units):
                 # assign value expected for this param
                 val_type = param.get("type")  # integer/string
 
+                if val_type == "array":
+                    items = param.get("items")
+                    if items:
+                        val_type = "[%s]" % items.get("type")
+
                 if param.get("enum"):
                     val_type = "enum"
                     desc += (

From 625913d797cda10d9916934351e598161adaced0 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 15:53:43 -0600
Subject: [PATCH 3/4] Add to changelog

---
 changelogs/client_server.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index feabecab..01670c74 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -15,6 +15,8 @@ Unreleased changes
   - Sticker messages:
     - Add sticker message event definition.
     (`#1158 <https://github.com/matrix-org/matrix-doc/pull/1158>`_).
+  - Document the ``server_name`` parameter on ``/join/{roomIdOrAlias}``
+    (`#1364 <https://github.com/matrix-org/matrix-doc/pull/1364>`_).
 
 - Spec clarifications:
 

From a6b0125da62e9c911ff15b8cbcf267499f95ee99 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 3 Jul 2018 16:19:31 -0600
Subject: [PATCH 4/4] Our swagger doesn't support explode yet

---
 api/client-server/joining.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/api/client-server/joining.yaml b/api/client-server/joining.yaml
index bd3e6885..471c5038 100644
--- a/api/client-server/joining.yaml
+++ b/api/client-server/joining.yaml
@@ -147,7 +147,6 @@ paths:
           type: array
           items:
             type: string
-          explode: true
           name: server_name
           description: |-
             The servers to attempt to join the room through. One of the servers