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

Add membership events to the end of the list, to ensure Sytest sees them

Browse source
This commit is contained in:
Till Faelligen 2022-03-14 12:53:43 +01:00
parent 507a8e6773
commit f603b094ee
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
syncapi/routing/context.go
View file

@ -158,17 +158,19 @@ func applyLazyLoadMembers(filter *gomatrixserverlib.RoomEventFilter, eventsAfter
} }
newState := []*gomatrixserverlib.HeaderedEvent{} newState := []*gomatrixserverlib.HeaderedEvent{}
membershipEvents := []*gomatrixserverlib.HeaderedEvent{}
for _, event := range state { for _, event := range state {
if event.Type() != gomatrixserverlib.MRoomMember { if event.Type() != gomatrixserverlib.MRoomMember {
newState = append(newState, event) newState = append(newState, event)
} else { } else {
// did the user send an event? // did the user send an event?
if x[event.Sender()] { 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) { func parseRoomEventFilter(req *http.Request) (*gomatrixserverlib.RoomEventFilter, error) {