From 91ee096b26255da4b75ccb564affbbb662a6e8e1 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 25 Nov 2020 14:59:17 +0000 Subject: [PATCH] Actually send message events to the roomserver.. --- internal/mscs/msc2836/msc2836.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/mscs/msc2836/msc2836.go b/internal/mscs/msc2836/msc2836.go index c68a169e1..13bb81c7d 100644 --- a/internal/mscs/msc2836/msc2836.go +++ b/internal/mscs/msc2836/msc2836.go @@ -570,9 +570,12 @@ func (rc *reqCtx) getLocalEvent(eventID string) *gomatrixserverlib.HeaderedEvent func (rc *reqCtx) injectResponseToRoomserver(res *gomatrixserverlib.MSC2836EventRelationshipsResponse) { var stateEvents []*gomatrixserverlib.Event + var messageEvents []*gomatrixserverlib.Event for _, ev := range res.Events { if ev.StateKey() != nil { stateEvents = append(stateEvents, ev) + } else { + messageEvents = append(messageEvents, ev) } } respState := gomatrixserverlib.RespState{ @@ -587,7 +590,7 @@ func (rc *reqCtx) injectResponseToRoomserver(res *gomatrixserverlib.MSC2836Event // everything gets sent as an outlier because auth chain events may be disjoint from the DAG // as may the threaded events. var ires []roomserver.InputRoomEvent - for _, outlier := range eventsInOrder { + for _, outlier := range append(eventsInOrder, messageEvents...) { ires = append(ires, roomserver.InputRoomEvent{ Kind: roomserver.KindOutlier, Event: outlier.Headered(outlier.Version()),