From a1bdfaa167fbf25010f3710ebbe57988c0bbfc0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?=
 <76261501+zecakeh@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:55:27 +0100
Subject: [PATCH] Remove the `origin` field in `PUT /send_join` responses
 (#2050)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove the `origin` field on PUT /send_join responses

This is a spec bug as it has actually never been sent by Synapse, going back to 2014.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

* Add changelog

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

---------

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
---
 changelogs/server_server/newsfragments/2050.clarification | 1 +
 data/api/server-server/joins-v1.yaml                      | 5 -----
 data/api/server-server/joins-v2.yaml                      | 5 -----
 3 files changed, 1 insertion(+), 10 deletions(-)
 create mode 100644 changelogs/server_server/newsfragments/2050.clarification

diff --git a/changelogs/server_server/newsfragments/2050.clarification b/changelogs/server_server/newsfragments/2050.clarification
new file mode 100644
index 000000000..8c4545d3b
--- /dev/null
+++ b/changelogs/server_server/newsfragments/2050.clarification
@@ -0,0 +1 @@
+Remove the `origin` field in `PUT /send_join` responses, because it was never sent in the first place.
diff --git a/data/api/server-server/joins-v1.yaml b/data/api/server-server/joins-v1.yaml
index 9247626a3..de671ef95 100644
--- a/data/api/server-server/joins-v1.yaml
+++ b/data/api/server-server/joins-v1.yaml
@@ -339,9 +339,6 @@ paths:
                       title: Room State
                       description: The state for the room.
                       properties:
-                        origin:
-                          type: string
-                          description: The resident server's [server name](/appendices/#server-name).
                         auth_chain:
                           type: array
                           description: |-
@@ -371,13 +368,11 @@ paths:
                       required:
                         - auth_chain
                         - state
-                        - origin
               examples:
                 response:
                   value: [
                     200,
                     {
-                      "origin": "matrix.org",
                       "auth_chain": [
                         {
                           "$ref": "examples/minimal_pdu.json"
diff --git a/data/api/server-server/joins-v2.yaml b/data/api/server-server/joins-v2.yaml
index 31f8098c0..bb45b1be2 100644
--- a/data/api/server-server/joins-v2.yaml
+++ b/data/api/server-server/joins-v2.yaml
@@ -160,9 +160,6 @@ paths:
               schema:
                 type: object
                 properties:
-                  origin:
-                    type: string
-                    description: The resident server's [server name](/appendices/#server-name).
                   members_omitted:
                     type: boolean
                     description: "`true` if `m.room.member` events have been omitted from `state`."
@@ -222,11 +219,9 @@ paths:
                 required:
                   - auth_chain
                   - state
-                  - origin
               examples:
                 response:
                   value: {
-                    "origin": "matrix.org",
                     "auth_chain": [
                       {
                         "$ref": "examples/minimal_pdu.json"