From f603b094eee7b354152c8aab561844e4b2c7b92f Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 14 Mar 2022 12:53:43 +0100 Subject: [PATCH] Add membership events to the end of the list, to ensure Sytest sees them --- syncapi/routing/context.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go index d07fc0c64..0f8525135 100644 --- a/syncapi/routing/context.go +++ b/syncapi/routing/context.go @@ -158,17 +158,19 @@ func applyLazyLoadMembers(filter *gomatrixserverlib.RoomEventFilter, eventsAfter } newState := []*gomatrixserverlib.HeaderedEvent{} + membershipEvents := []*gomatrixserverlib.HeaderedEvent{} for _, event := range state { if event.Type() != gomatrixserverlib.MRoomMember { newState = append(newState, event) } else { // did the user send an event? if x[event.Sender()] { - newState = append(newState, event) + membershipEvents = append(newState, event) } } } - return newState + // Add the membershipEvents to the end of the list, to make Sytest happy + return append(newState, membershipEvents...) } func parseRoomEventFilter(req *http.Request) (*gomatrixserverlib.RoomEventFilter, error) {