From a4401e3fb05cb9bf95163a7cd02c3564941dd98a Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 6 Mar 2020 11:23:11 +0000 Subject: [PATCH] Update common.BuildEvent --- common/events.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/events.go b/common/events.go index 2cca8c2fa..f347cea49 100644 --- a/common/events.go +++ b/common/events.go @@ -47,16 +47,17 @@ func BuildEvent( return nil, err } - fmt.Println("BUILDING EVENT FOR ROOM", builder.RoomID) roomVersion := 2 - vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: builder.RoomID} vQueryRes := api.QueryRoomVersionForRoomIDResponse{} - if e := queryAPI.QueryRoomVersionForRoomID(ctx, &vQueryReq, &vQueryRes); e != nil { - fmt.Println("Eaux neaux, an error occured:", e) + if e := queryAPI.QueryRoomVersionForRoomID(ctx, &vQueryReq, &vQueryRes); e == nil { + roomVersion = vQueryRes.RoomVersion } + fmt.Println("Building event for", roomVersion) - fmt.Println("ROOM VERSION IS", roomVersion) + // FIXME: Why don't we delegate to the BuildEvent function from + // gomatrixserverlib here? + // TODO: Room versions affect the below eventID := fmt.Sprintf("$%s:%s", util.RandomString(16), cfg.Matrix.ServerName) event, err := builder.Build(eventID, evTime, cfg.Matrix.ServerName, cfg.Matrix.KeyID, cfg.Matrix.PrivateKey)