From 23e709ae9bb4bb2f769ba6254444349f5ee39d94 Mon Sep 17 00:00:00 2001
From: Johannes Marbach <n0-0ne+github@mailbox.org>
Date: Tue, 11 Feb 2025 19:03:25 +0100
Subject: [PATCH] MSC4213: Remove server_name parameter (#2059)

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
---
 .../client_server/newsfragments/2059.removal  |  1 +
 content/appendices.md                         |  4 +--
 data/api/client-server/joining.yaml           | 25 -------------------
 data/api/client-server/knocking.yaml          | 25 -------------------
 4 files changed, 3 insertions(+), 52 deletions(-)
 create mode 100644 changelogs/client_server/newsfragments/2059.removal

diff --git a/changelogs/client_server/newsfragments/2059.removal b/changelogs/client_server/newsfragments/2059.removal
new file mode 100644
index 00000000..94db06f8
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2059.removal
@@ -0,0 +1 @@
+Remove `server_name` parameter from `/_matrix/client/v3/join/{roomIdOrAlias}` and `/_matrix/client/v3/knock/{roomIdOrAlias}` as per [MSC4213](https://github.com/matrix-org/matrix-spec-proposals/pull/4213).
diff --git a/content/appendices.md b/content/appendices.md
index 7cf8e315..349b05e9 100644
--- a/content/appendices.md
+++ b/content/appendices.md
@@ -916,8 +916,8 @@ A room (or room permalink) which isn't using a room alias should supply
 at least one server using `via` in the URI's query string. Multiple servers
 can be specified by including multuple `via` parameters.
 
-The values of `via` are intended to be passed along as the `server_name`
-parameters on the [Client Server `/join/{roomIdOrAlias}` API](/client-server-api/#post_matrixclientv3joinroomidoralias).
+The values of `via` are intended to be passed along on the
+[Client Server `/join/{roomIdOrAlias}` API](/client-server-api/#post_matrixclientv3joinroomidoralias).
 
 When generating room links and permalinks, the application should pick
 servers which have a high probability of being in the room in the
diff --git a/data/api/client-server/joining.yaml b/data/api/client-server/joining.yaml
index 1019abbd..8ba488e4 100644
--- a/data/api/client-server/joining.yaml
+++ b/data/api/client-server/joining.yaml
@@ -137,31 +137,6 @@ paths:
           example: "#monkeys:matrix.org"
           schema:
             type: string
-        - in: query
-          name: server_name
-          deprecated: true
-          x-changedInMatrixVersion:
-            "1.12": |-
-              This parameter has been deprecated in favour of `via` and will be removed in
-              a future version of the spec.
-
-              Clients SHOULD use `via` when the homeserver they're talking to supports it.
-              To do this, they MAY either detect server support through the supported spec
-              versions in [`/_matrix/client/versions`](/client-server-api/#get_matrixclientversions)
-              or always include both parameters with identical values.
-
-              Homeservers MUST ignore all `server_name` parameters if any `via` parameters
-              are supplied.
-          description: |-
-            The servers to attempt to join the room through. One of the servers
-            must be participating in the room.
-          example:
-            - matrix.org
-            - elsewhere.ca
-          schema:
-            type: array
-            items:
-              type: string
         - in: query
           name: via
           x-addedInMatrixVersion: "1.12"
diff --git a/data/api/client-server/knocking.yaml b/data/api/client-server/knocking.yaml
index 085aa74f..06b93ddf 100644
--- a/data/api/client-server/knocking.yaml
+++ b/data/api/client-server/knocking.yaml
@@ -48,31 +48,6 @@ paths:
           example: "#monkeys:matrix.org"
           schema:
             type: string
-        - in: query
-          name: server_name
-          deprecated: true
-          x-changedInMatrixVersion:
-            "1.12": |-
-              This parameter has been deprecated in favour of `via` and will be removed in
-              a future version of the spec.
-
-              Clients SHOULD use `via` when the homeserver they're talking to supports it.
-              To do this, they MAY either detect server support through the supported spec
-              versions in [`/_matrix/client/versions`](/client-server-api/#get_matrixclientversions)
-              or always include both parameters with identical values.
-
-              Homeservers MUST ignore all `server_name` parameters if any `via` parameters
-              are supplied.
-          description: |-
-            The servers to attempt to knock on the room through. One of the servers
-            must be participating in the room.
-          example:
-            - matrix.org
-            - elsewhere.ca
-          schema:
-            type: array
-            items:
-              type: string
         - in: query
           name: via
           x-addedInMatrixVersion: "1.12"