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

Only unmarshal create content if specified

Browse source
This commit is contained in:
Neil Alexander 2021-07-21 11:19:53 +01:00
parent f27bda2298
commit 60f43e37c2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clientapi/routing/createroom.go
View file

@ -207,12 +207,14 @@ func createRoom(
} }
createContent := map[string]interface{}{} createContent := map[string]interface{}{}
if len(r.CreationContent) > 0 {
if err = json.Unmarshal(r.CreationContent, &createContent); err != nil { if err = json.Unmarshal(r.CreationContent, &createContent); err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("invalid create content"), JSON: jsonerror.BadJSON("invalid create content"),
} }
} }
}
createContent["creator"] = userID createContent["creator"] = userID
createContent["room_version"] = roomVersion createContent["room_version"] = roomVersion
powerLevelContent := eventutil.InitialPowerLevelsContent(userID) powerLevelContent := eventutil.InitialPowerLevelsContent(userID)