From 2b4353eeca3440546dfe868ec92cc4a797bb7daf Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Sun, 27 Sep 2020 00:31:15 +0100 Subject: [PATCH] fix SendEventWithRewrite not to bail if handed a non-state event --- roomserver/api/wrapper.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/roomserver/api/wrapper.go b/roomserver/api/wrapper.go index ec27b304f..f8fb1dd19 100644 --- a/roomserver/api/wrapper.go +++ b/roomserver/api/wrapper.go @@ -46,7 +46,6 @@ func SendEvents( func SendEventWithState( ctx context.Context, rsAPI RoomserverInternalAPI, state *gomatrixserverlib.RespState, event gomatrixserverlib.HeaderedEvent, haveEventIDs map[string]bool, - roomVersion gomatrixserverlib.RoomVersion, ) error { outliers, err := state.Events() if err != nil { @@ -60,7 +59,7 @@ func SendEventWithState( } ires = append(ires, InputRoomEvent{ Kind: KindOutlier, - Event: outlier.Headered(roomVersion), + Event: outlier.Headered(event.RoomVersion), AuthEventIDs: outlier.AuthEventIDs(), }) } @@ -116,9 +115,6 @@ func SendEventWithRewrite( if haveEventIDs[authOrStateEvent.EventID()] { continue } - if event.StateKey() == nil { - continue - } // We will handle an event as if it's an outlier if one of the // following conditions is true: