From f5b103b1f036999ed2543aff7b1b0acac377b8f0 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 11 Mar 2020 11:34:41 +0000 Subject: [PATCH] Try to populate fields based on room version from OutputNewRoomEvent --- syncapi/consumers/roomserver.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go index 136934ef4..a7569dca1 100644 --- a/syncapi/consumers/roomserver.go +++ b/syncapi/consumers/roomserver.go @@ -27,7 +27,6 @@ import ( "github.com/matrix-org/dendrite/syncapi/types" "github.com/matrix-org/gomatrixserverlib" log "github.com/sirupsen/logrus" - "github.com/tidwall/gjson" sarama "gopkg.in/Shopify/sarama.v1" ) @@ -100,14 +99,10 @@ func (s *OutputRoomEventConsumer) onNewRoomEvent( ctx context.Context, msg api.OutputNewRoomEvent, ) error { ev := msg.Event - roomVersion := gomatrixserverlib.RoomVersionV1 - if rv := gjson.Get(string(ev.Content()), "room_version"); rv.Exists() { - roomVersion = gomatrixserverlib.RoomVersion(rv.String()) - } - if err := msg.Event.PrepareAs(roomVersion); err != nil { + if err := msg.Event.PrepareAs(msg.RoomVersion); err != nil { log.WithFields(log.Fields{ - "room_version": roomVersion, + "room_version": msg.RoomVersion, }).WithError(err).Errorf("can't prepare event to version") }