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

Review comments

Browse source
This commit is contained in:
Kegan Dougal 2017-03-09 10:51:35 +00:00
parent 5e19d9d340
commit 533e5dba5a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/github.com/matrix-org/dendrite/clientapi/writers/createroom.go
View file

@ -66,6 +66,15 @@ type createRoomResponse struct {
// CreateRoom implements /createRoom // CreateRoom implements /createRoom
func CreateRoom(req *http.Request) util.JSONResponse { func CreateRoom(req *http.Request) util.JSONResponse {
serverName := "localhost"
// TODO: Check room ID doesn't clash with an existing one, and we
// probably shouldn't be using pseudo-random strings, maybe GUIDs?
roomID := fmt.Sprintf("!%s:%s", util.RandomString(16), serverName)
return createRoom(req, roomID)
}
// createRoom implements /createRoom
func createRoom(req *http.Request, roomID string) util.JSONResponse {
logger := util.GetLogger(req.Context()) logger := util.GetLogger(req.Context())
userID, resErr := auth.VerifyAccessToken(req) userID, resErr := auth.VerifyAccessToken(req)
if resErr != nil { if resErr != nil {
@ -84,9 +93,6 @@ func CreateRoom(req *http.Request) util.JSONResponse {
// TODO: visibility/presets/raw initial state/creation content // TODO: visibility/presets/raw initial state/creation content
serverName := "localhost"
roomID := fmt.Sprintf("!%s:%s", util.RandomString(16), serverName)
// TODO: Check room ID doesn't clash with an existing one
// TODO: Create room alias association // TODO: Create room alias association
logger.WithFields(log.Fields{ logger.WithFields(log.Fields{