From 56e9dd3ef34141cbcd244348c0047b7d6e74e2a7 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 6 Apr 2022 15:37:06 +0100 Subject: [PATCH] Avoid a pointless HTTP request if possible --- appservice/consumers/roomserver.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go index 45fadf935..31e05caa0 100644 --- a/appservice/consumers/roomserver.go +++ b/appservice/consumers/roomserver.go @@ -100,10 +100,12 @@ func (s *OutputRoomEventConsumer) onMessage(ctx context.Context, msg *nats.Msg) eventsReq.EventIDs = append(eventsReq.EventIDs, eventID) } } - if err := s.rsAPI.QueryEventsByID(s.ctx, eventsReq, eventsRes); err != nil { - return false + if len(eventsReq.EventIDs) > 0 { + if err := s.rsAPI.QueryEventsByID(s.ctx, eventsReq, eventsRes); err != nil { + return false + } + events = append(events, eventsRes.Events...) } - events = append(events, eventsRes.Events...) } // Send event to any relevant application services