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

Fix create content

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

13
clientapi/routing/createroom.go
View file

@ -206,10 +206,15 @@ func createRoom(
return jsonerror.InternalServerError() return jsonerror.InternalServerError()
} }
createContent := gomatrixserverlib.CreateContent{ createContent := map[string]interface{}{}
Creator: userID, if err = json.Unmarshal(r.CreationContent, &createContent); err != nil {
RoomVersion: &roomVersion, return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("invalid create content"),
}
} }
createContent["creator"] = userID
createContent["room_version"] = roomVersion
powerLevelContent := eventutil.InitialPowerLevelsContent(userID) powerLevelContent := eventutil.InitialPowerLevelsContent(userID)
joinRuleContent := gomatrixserverlib.JoinRuleContent{ joinRuleContent := gomatrixserverlib.JoinRuleContent{
JoinRule: gomatrixserverlib.Invite, JoinRule: gomatrixserverlib.Invite,
@ -331,7 +336,7 @@ func createRoom(
for i := range r.InitialState { for i := range r.InitialState {
switch r.InitialState[i].Type { switch r.InitialState[i].Type {
case gomatrixserverlib.MRoomCreate: case gomatrixserverlib.MRoomCreate:
createEvent = r.InitialState[i] continue
case gomatrixserverlib.MRoomPowerLevels: case gomatrixserverlib.MRoomPowerLevels:
powerLevelEvent = r.InitialState[i] powerLevelEvent = r.InitialState[i]