From 7f9321825b288796eb9e436e01ab38253d237aaf Mon Sep 17 00:00:00 2001
From: Cnly <minecnly@gmail.com>
Date: Tue, 9 Jul 2019 12:32:39 +0800
Subject: [PATCH] Add missing servers field in /directory/room/:alias response

Signed-off-by: Alex Chen <minecnly@gmail.com>
---
 clientapi/routing/directory.go | 15 +++++++++++++--
 testfile                       |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/clientapi/routing/directory.go b/clientapi/routing/directory.go
index b23dfbfb6..b15082981 100644
--- a/clientapi/routing/directory.go
+++ b/clientapi/routing/directory.go
@@ -28,6 +28,11 @@ import (
 	"github.com/matrix-org/util"
 )
 
+type roomDirectoryResponse struct {
+	RoomID  string   `json:"room_id"`
+	Servers []string `json:"servers"`
+}
+
 // DirectoryRoom looks up a room alias
 func DirectoryRoom(
 	req *http.Request,
@@ -56,7 +61,10 @@ func DirectoryRoom(
 		if len(queryRes.RoomID) > 0 {
 			return util.JSONResponse{
 				Code: http.StatusOK,
-				JSON: queryRes,
+				JSON: roomDirectoryResponse{
+					RoomID: queryRes.RoomID,
+					Servers: []string{}, // TODO-aliases
+				},
 			}
 		}
 	} else {
@@ -74,7 +82,10 @@ func DirectoryRoom(
 		if len(resp.RoomID) > 0 {
 			return util.JSONResponse{
 				Code: http.StatusOK,
-				JSON: resp,
+				JSON: roomDirectoryResponse{
+					RoomID: resp.RoomID,
+					Servers: []string{}, // TODO-aliases
+				},
 			}
 		}
 	}
diff --git a/testfile b/testfile
index 362df4513..0ddaba417 100644
--- a/testfile
+++ b/testfile
@@ -143,3 +143,10 @@ Events come down the correct room
 local user can join room with version 5
 User can invite local user to room with version 5
 Inbound federation can receive room-join requests
+GET /directory/room/:room_alias yields room ID
+PUT /directory/room/:room_alias creates alias
+Room aliases can contain Unicode
+Creators can delete alias
+Alias creators can delete alias with no ops
+Alias creators can delete canonical alias with no ops
+Regular users cannot create room aliases within the AS namespace