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

Merge branch 'master' into kegan/create-room-events

Browse source
This commit is contained in:
Kegan Dougal 2017-03-07 16:12:17 +00:00
parent c28f9a7458 8ba9d4af04
commit 66ba84f8e6
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import (
"github.com/matrix-org/util" "github.com/matrix-org/util"
) )
// http://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom // https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom
type createRoomRequest struct { type createRoomRequest struct {
Invite []string `json:"invite"` Invite []string `json:"invite"`
Name string `json:"name"` Name string `json:"name"`
@ -23,7 +23,7 @@ type createRoomRequest struct {
RoomAliasName string `json:"room_alias_name"` RoomAliasName string `json:"room_alias_name"`
} }
// http://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom // https://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-createroom
type createRoomResponse struct { type createRoomResponse struct {
RoomID string `json:"room_id"` RoomID string `json:"room_id"`
RoomAlias string `json:"room_alias,omitempty"` // in synapse not spec RoomAlias string `json:"room_alias,omitempty"` // in synapse not spec
@ -41,7 +41,6 @@ func CreateRoom(req *http.Request) util.JSONResponse {
if resErr != nil { if resErr != nil {
return *resErr return *resErr
} }
// TODO: apply rate-limit // TODO: apply rate-limit
// TODO: parse room_alias_name // TODO: parse room_alias_name
// TODO: parse invite list (all valid user ids) // TODO: parse invite list (all valid user ids)
@ -80,6 +79,5 @@ func CreateRoom(req *http.Request) util.JSONResponse {
// This differs from Synapse slightly. Synapse would vary the ordering of 3-7 // This differs from Synapse slightly. Synapse would vary the ordering of 3-7
// depending on if those events were in "initial_state" or not. This made it // depending on if those events were in "initial_state" or not. This made it
// harder to reason about, hence sticking to a strict static ordering. // harder to reason about, hence sticking to a strict static ordering.
return util.MessageResponse(404, "Not implemented yet") return util.MessageResponse(404, "Not implemented yet")
} }