From 454d04fc90ae9697918053207fe695178c862f59 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 3 Apr 2020 11:47:39 +0100 Subject: [PATCH] Revert check in processMessage --- federationsender/consumers/roomserver.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/federationsender/consumers/roomserver.go b/federationsender/consumers/roomserver.go index 3dc32d31c..f59405af0 100644 --- a/federationsender/consumers/roomserver.go +++ b/federationsender/consumers/roomserver.go @@ -130,11 +130,6 @@ func (s *OutputRoomEventConsumer) onMessage(msg *sarama.ConsumerMessage) error { // processMessage updates the list of currently joined hosts in the room // and then sends the event to the hosts that were joined before the event. func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent) error { - if ore.SendAsServer == api.DoNotSendToOtherServers { - // Ignore event that we don't need to send anywhere. - return nil - } - addsStateEvents, err := s.lookupStateEvents(ore.AddsStateEventIDs, ore.Event.Event) if err != nil { return err @@ -168,6 +163,11 @@ func (s *OutputRoomEventConsumer) processMessage(ore api.OutputNewRoomEvent) err return nil } + if ore.SendAsServer == api.DoNotSendToOtherServers { + // Ignore event that we don't need to send anywhere. + return nil + } + // Work out which hosts were joined at the event itself. joinedHostsAtEvent, err := s.joinedHostsAtEvent(ore, oldJoinedHosts) if err != nil {