mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-06 06:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0ec82fbeae into 79b87c7a08

Browse source
This commit is contained in:
Johannes Marbach 2024-11-14 15:12:08 +01:00 committed by GitHub
parent 79b87c7a08 0ec82fbeae
commit 1656bc0249
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clientapi/routing/joinroom.go
View file

@ -44,9 +44,16 @@ func JoinRoomByIDOrAlias(
Content: map[string]interface{}{}, Content: map[string]interface{}{},
} }
// Check to see if any ?server_name= query parameters were // Check to see if any ?via= or ?server_name= query parameters
// given in the request. // were given in the request.
if serverNames, ok := req.URL.Query()["server_name"]; ok { if serverNames, ok := req.URL.Query()["via"]; ok {
for _, serverName := range serverNames {
joinReq.ServerNames = append(
joinReq.ServerNames,
spec.ServerName(serverName),
)
}
} else if serverNames, ok := req.URL.Query()["server_name"]; ok {
for _, serverName := range serverNames { for _, serverName := range serverNames {
joinReq.ServerNames = append( joinReq.ServerNames = append(
joinReq.ServerNames, joinReq.ServerNames,