From d3634504b7cd4ade15a836b58affcfd5540fdb00 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 11 Mar 2020 11:48:07 +0000 Subject: [PATCH] Move appservice event filter --- appservice/consumers/roomserver.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index de53a09ed..44ac9fc3e 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -82,6 +82,13 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // Parse out the event JSON var output api.OutputEvent + if output.Type != api.OutputTypeNewRoomEvent { + log.WithField("type", output.Type).Debug( + "roomserver output log: ignoring unknown output type", + ) + return nil + } + // Get the room version of the room vQueryReq := api.QueryRoomVersionForRoomIDRequest{RoomID: string(msg.Key)} vQueryRes := api.QueryRoomVersionForRoomIDResponse{} @@ -107,13 +114,6 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { return nil } - if output.Type != api.OutputTypeNewRoomEvent { - log.WithField("type", output.Type).Debug( - "roomserver output log: ignoring unknown output type", - ) - return nil - } - ev := output.NewRoomEvent.Event log.WithFields(log.Fields{ "event_id": ev.EventID(),