Review comments

This commit is contained in:
Mark Haines 2017-03-14 14:52:19 +00:00
parent c9a2c9a8f7
commit 4ad5566759

View file

@ -41,9 +41,9 @@ Environment:
(default: 10) (default: 10)
FORMAT The output format to use for the messages. FORMAT The output format to use for the messages.
INPUT -> api.InputRoomEvent InputRoomEvent
RAW -> gomatrixserverlib.Event Event
(default: INPUT) (default: InputRoomEvent)
` `
var ( var (
@ -95,14 +95,14 @@ func main() {
b.Type = "m.room.create" b.Type = "m.room.create"
b.StateKey = &emptyString b.StateKey = &emptyString
b.SetContent(map[string]string{"creator": userID}) b.SetContent(map[string]string{"creator": userID})
create := build() create := buildAndOutput()
// Build a m.room.member event. // Build a m.room.member event.
b.Type = "m.room.member" b.Type = "m.room.member"
b.StateKey = &userID b.StateKey = &userID
b.SetContent(map[string]string{"membership": "join"}) b.SetContent(map[string]string{"membership": "join"})
b.AuthEvents = []gomatrixserverlib.EventReference{create} b.AuthEvents = []gomatrixserverlib.EventReference{create}
member := build() member := buildAndOutput()
// Build a number of m.room.message events. // Build a number of m.room.message events.
b.Type = "m.room.message" b.Type = "m.room.message"
@ -110,12 +110,12 @@ func main() {
b.SetContent(map[string]string{"body": "Test Message"}) b.SetContent(map[string]string{"body": "Test Message"})
b.AuthEvents = []gomatrixserverlib.EventReference{create, member} b.AuthEvents = []gomatrixserverlib.EventReference{create, member}
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
build() buildAndOutput()
} }
} }
// Build an event and write the event to the output. // Build an event and write the event to the output.
func build() gomatrixserverlib.EventReference { func buildAndOutput() gomatrixserverlib.EventReference {
eventID++ eventID++
id := fmt.Sprintf("$%d:%s", eventID, serverName) id := fmt.Sprintf("$%d:%s", eventID, serverName)
now = time.Unix(0, 0) now = time.Unix(0, 0)
@ -133,7 +133,7 @@ func build() gomatrixserverlib.EventReference {
// Write an event to the output. // Write an event to the output.
func writeEvent(event gomatrixserverlib.Event) { func writeEvent(event gomatrixserverlib.Event) {
encoder := json.NewEncoder(os.Stdout) encoder := json.NewEncoder(os.Stdout)
if format == "INPUT" { if format == "InputRoomEvent" {
var ire api.InputRoomEvent var ire api.InputRoomEvent
ire.Kind = api.KindNew ire.Kind = api.KindNew
ire.Event = event.JSON() ire.Event = event.JSON()
@ -145,7 +145,7 @@ func writeEvent(event gomatrixserverlib.Event) {
if err := encoder.Encode(ire); err != nil { if err := encoder.Encode(ire); err != nil {
panic(err) panic(err)
} }
} else if format == "RAW" { } else if format == "Event" {
if err := encoder.Encode(event); err != nil { if err := encoder.Encode(event); err != nil {
panic(err) panic(err)
} }