From 6da06383e825a6adfd61a1d8cb0fe53fcec1f7de Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Thu, 16 Jul 2020 15:17:40 +0100
Subject: [PATCH] Allow `/make_join` to return a 404 (#2688)

Specify that `GET /_matrix/federation/v1/make_join/{roomId}/{userId}` can
return a 404 if the room is unknown.
---
 api/server-server/joins-v1.yaml                        | 10 ++++++++++
 .../server_server/newsfragments/2688.clarification     |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 changelogs/server_server/newsfragments/2688.clarification

diff --git a/api/server-server/joins-v1.yaml b/api/server-server/joins-v1.yaml
index 18c88db0..d4fc8f24 100644
--- a/api/server-server/joins-v1.yaml
+++ b/api/server-server/joins-v1.yaml
@@ -162,6 +162,16 @@ paths:
               "error": "Your homeserver does not support the features required to join this room",
               "room_version": "3"
             }
+        404:
+          description: |-
+            The room that the joining server is attempting to join is unknown
+            to the receiving server.
+          examples:
+            application/json: {
+              "errcode": "M_NOT_FOUND",
+              "error": "Unknown room",
+            }
+  
   "/send_join/{roomId}/{eventId}":
     put:
       summary: Submit a signed join event to a resident server
diff --git a/changelogs/server_server/newsfragments/2688.clarification b/changelogs/server_server/newsfragments/2688.clarification
new file mode 100644
index 00000000..641893d3
--- /dev/null
+++ b/changelogs/server_server/newsfragments/2688.clarification
@@ -0,0 +1 @@
+Specify that `GET /_matrix/federation/v1/make_join/{roomId}/{userId}` can return a 404 if the room is unknown.
\ No newline at end of file