From 42183bef508be3495ac429abf29b795f9c8d2a6e Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 26 Aug 2020 18:23:08 +0100 Subject: [PATCH] Allow join to accept server_name in query parameters (#1346) --- clientapi/routing/joinroom.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go index cb68fe196..6e159b2af 100644 --- a/clientapi/routing/joinroom.go +++ b/clientapi/routing/joinroom.go @@ -41,6 +41,17 @@ func JoinRoomByIDOrAlias( } joinRes := roomserverAPI.PerformJoinResponse{} + // Check to see if any ?server_name= query parameters were + // given in the request. + if serverNames, ok := req.URL.Query()["server_name"]; ok { + for _, serverName := range serverNames { + joinReq.ServerNames = append( + joinReq.ServerNames, + gomatrixserverlib.ServerName(serverName), + ) + } + } + // If content was provided in the request then incude that // in the request. It'll get used as a part of the membership // event content.