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

Review comments

Browse source
This commit is contained in:
Kegan Dougal 2017-03-10 11:26:31 +00:00
parent 5d69e54525
commit b6bc570095
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -72,7 +72,7 @@ type createRoomResponse struct {
// fledglingEvent is a helper representation of an event used when creating many events in succession. // fledglingEvent is a helper representation of an event used when creating many events in succession.
type fledglingEvent struct { type fledglingEvent struct {
Type string Type string
StateKey *string StateKey string
Content interface{} Content interface{}
} }
@ -133,14 +133,13 @@ func createRoom(req *http.Request, cfg config.ClientAPI, roomID string) util.JSO
// 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.
// TODO: Synapse has txn/token ID on each event. Do we need to do this here? // TODO: Synapse has txn/token ID on each event. Do we need to do this here?
emptyString := ""
eventsToMake := []fledglingEvent{ eventsToMake := []fledglingEvent{
{"m.room.create", &emptyString, events.CreateContent{Creator: userID}}, {"m.room.create", "", events.CreateContent{Creator: userID}},
{"m.room.member", &userID, events.MemberContent{Membership: "join"}}, // TODO: Set avatar_url / displayname {"m.room.member", userID, events.MemberContent{Membership: "join"}}, // TODO: Set avatar_url / displayname
{"m.room.power_levels", &emptyString, events.InitialPowerLevelsContent(userID)}, {"m.room.power_levels", "", events.InitialPowerLevelsContent(userID)},
// TODO: m.room.canonical_alias // TODO: m.room.canonical_alias
{"m.room.join_rules", &emptyString, events.JoinRulesContent{"public"}}, // FIXME: Allow this to be changed {"m.room.join_rules", "", events.JoinRulesContent{"public"}}, // FIXME: Allow this to be changed
{"m.room.history_visibility", &emptyString, events.HistoryVisibilityContent{"joined"}}, // FIXME: Allow this to be changed {"m.room.history_visibility", "", events.HistoryVisibilityContent{"joined"}}, // FIXME: Allow this to be changed
// TODO: m.room.guest_access // TODO: m.room.guest_access
// TODO: Other initial state items // TODO: Other initial state items
// TODO: m.room.name // TODO: m.room.name
@ -158,7 +157,7 @@ func createRoom(req *http.Request, cfg config.ClientAPI, roomID string) util.JSO
Sender: userID, Sender: userID,
RoomID: roomID, RoomID: roomID,
Type: e.Type, Type: e.Type,
StateKey: e.StateKey, StateKey: &e.StateKey,
Depth: int64(depth), Depth: int64(depth),
} }
builder.SetContent(e.Content) builder.SetContent(e.Content)
@ -174,7 +173,8 @@ func createRoom(req *http.Request, cfg config.ClientAPI, roomID string) util.JSO
return util.ErrorResponse(err) return util.ErrorResponse(err)
} }
builtEventMap[common.StateKeyTuple{e.Type, *e.StateKey}] = ev // Add the event to the list of auth events
builtEventMap[common.StateKeyTuple{e.Type, e.StateKey}] = ev
builtEvents = append(builtEvents, ev) builtEvents = append(builtEvents, ev)
} }