mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 00:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Actually send message events to the roomserver..

Browse source
This commit is contained in:
Kegan Dougal 2020-11-25 14:59:17 +00:00
parent 095cc3e7bf
commit 91ee096b26
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/mscs/msc2836/msc2836.go
View file

@ -570,9 +570,12 @@ func (rc *reqCtx) getLocalEvent(eventID string) *gomatrixserverlib.HeaderedEvent
func (rc *reqCtx) injectResponseToRoomserver(res *gomatrixserverlib.MSC2836EventRelationshipsResponse) { func (rc *reqCtx) injectResponseToRoomserver(res *gomatrixserverlib.MSC2836EventRelationshipsResponse) {
var stateEvents []*gomatrixserverlib.Event var stateEvents []*gomatrixserverlib.Event
var messageEvents []*gomatrixserverlib.Event
for _, ev := range res.Events { for _, ev := range res.Events {
if ev.StateKey() != nil { if ev.StateKey() != nil {
stateEvents = append(stateEvents, ev) stateEvents = append(stateEvents, ev)
} else {
messageEvents = append(messageEvents, ev)
} }
} }
respState := gomatrixserverlib.RespState{ 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 // everything gets sent as an outlier because auth chain events may be disjoint from the DAG
// as may the threaded events. // as may the threaded events.
var ires []roomserver.InputRoomEvent var ires []roomserver.InputRoomEvent
for _, outlier := range eventsInOrder { for _, outlier := range append(eventsInOrder, messageEvents...) {
ires = append(ires, roomserver.InputRoomEvent{ ires = append(ires, roomserver.InputRoomEvent{
Kind: roomserver.KindOutlier, Kind: roomserver.KindOutlier,
Event: outlier.Headered(outlier.Version()), Event: outlier.Headered(outlier.Version()),