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

Set defaults if no preset. Use switch instead of if

Browse source
This commit is contained in:
Andrew Morgan 2018-06-14 11:15:27 +01:00
parent 7d246f906a
commit f1e1e39499
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,17 +87,14 @@ func (r createRoomRequest) Validate() *util.JSONResponse {
} }
} }
} }
if r.Preset != "" {
switch r.Preset { switch r.Preset {
case presetPrivateChat, presetTrustedPrivateChat, presetPublicChat: case presetPrivateChat, presetTrustedPrivateChat, presetPublicChat, "":
break
default: default:
return &util.JSONResponse{ return &util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: jsonerror.BadJSON("preset must be any of 'private_chat', 'trusted_private_chat', 'public_chat'"), JSON: jsonerror.BadJSON("preset must be any of 'private_chat', 'trusted_private_chat', 'public_chat'"),
} }
} }
}
return nil return nil
} }
@ -172,7 +169,7 @@ func createRoom(req *http.Request, device *authtypes.Device,
var joinRules, historyVisibility string var joinRules, historyVisibility string
switch r.Preset { switch r.Preset {
case presetPrivateChat: case presetPrivateChat, "":
joinRules = joinRuleInvite joinRules = joinRuleInvite
historyVisibility = historyVisibilityShared historyVisibility = historyVisibilityShared
case presetTrustedPrivateChat: case presetTrustedPrivateChat: