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

Review comments @Kegsay

Browse source
This commit is contained in:
Neil Alexander 2021-07-21 12:13:18 +01:00
parent 60f43e37c2
commit 33b3b07b39
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/createroom.go
View file

@ -209,6 +209,7 @@ func createRoom(
createContent := map[string]interface{}{} createContent := map[string]interface{}{}
if len(r.CreationContent) > 0 { if len(r.CreationContent) > 0 {
if err = json.Unmarshal(r.CreationContent, &createContent); err != nil { if err = json.Unmarshal(r.CreationContent, &createContent); err != nil {
util.GetLogger(req.Context()).WithError(err).Error("json.Unmarshal for creation_content failed")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("invalid create content"), JSON: jsonerror.BadJSON("invalid create content"),
@ -229,6 +230,7 @@ func createRoom(
// Merge powerLevelContentOverride fields by unmarshalling it atop the defaults // Merge powerLevelContentOverride fields by unmarshalling it atop the defaults
err = json.Unmarshal(r.PowerLevelContentOverride, &powerLevelContent) err = json.Unmarshal(r.PowerLevelContentOverride, &powerLevelContent)
if err != nil { if err != nil {
util.GetLogger(req.Context()).WithError(err).Error("json.Unmarshal for power_level_content_override failed")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("malformed power_level_content_override"), JSON: jsonerror.BadJSON("malformed power_level_content_override"),
@ -336,6 +338,11 @@ func createRoom(
var initialStateEvents []fledglingEvent var initialStateEvents []fledglingEvent
for i := range r.InitialState { for i := range r.InitialState {
if r.InitialState[i].StateKey != "" {
initialStateEvents = append(initialStateEvents, r.InitialState[i])
continue
}
switch r.InitialState[i].Type { switch r.InitialState[i].Type {
case gomatrixserverlib.MRoomCreate: case gomatrixserverlib.MRoomCreate:
continue continue