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

Fix comments

Browse source
This commit is contained in:
Mark Haines 2017-06-27 11:15:41 +01:00
parent 9607e6dc5f
commit 9c73a69d07
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/clientapi/readers/directory.go
View file

@ -44,7 +44,7 @@ func DirectoryRoom(
} }
if domain == cfg.Matrix.ServerName { if domain == cfg.Matrix.ServerName {
// TODO: Implement joining local room aliases. // TODO: Implement lookup up local room aliases.
panic(fmt.Errorf("Looking up local room aliases is not implemented")) panic(fmt.Errorf("Looking up local room aliases is not implemented"))
} else { } else {
resp, err := federation.LookupRoomAlias(domain, roomAlias) resp, err := federation.LookupRoomAlias(domain, roomAlias)
@ -58,6 +58,8 @@ func DirectoryRoom(
} }
} }
} }
// TODO: Return 502 if the remote server errored.
// TODO: Return 504 if the remote server timed out.
return httputil.LogThenError(req, err) return httputil.LogThenError(req, err)
} }

1
src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
View file

@ -107,7 +107,6 @@ func Setup(
r0mux.Handle("/directory/room/{roomAlias}", r0mux.Handle("/directory/room/{roomAlias}",
common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse { common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
// TODO: Return the result of looking up the room in the room directory
vars := mux.Vars(req) vars := mux.Vars(req)
return readers.DirectoryRoom(req, device, vars["roomAlias"], federation, &cfg) return readers.DirectoryRoom(req, device, vars["roomAlias"], federation, &cfg)
}), }),