Fix tests again

This commit is contained in:
Till Faelligen 2022-11-01 13:54:59 +01:00
parent 06850b06cd
commit 621326a5d6
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E

View file

@ -255,9 +255,9 @@ func (r *Queryer) QueryMembershipAtEvent(
} }
var memberships []types.Event var memberships []types.Event
for i, eventID := range request.EventIDs { for _, eventID := range request.EventIDs {
stateEntry, ok := stateEntries[eventID] stateEntry, ok := stateEntries[eventID]
if !ok { if !ok || len(stateEntry) == 0 {
response.Memberships[eventID] = []*gomatrixserverlib.HeaderedEvent{} response.Memberships[eventID] = []*gomatrixserverlib.HeaderedEvent{}
continue continue
} }
@ -265,7 +265,7 @@ func (r *Queryer) QueryMembershipAtEvent(
// If we can short circuit, e.g. we only have 0 or 1 membership events, we only get the memberships // If we can short circuit, e.g. we only have 0 or 1 membership events, we only get the memberships
// once. If we have more than one membership event, we need to get the state for each state entry. // once. If we have more than one membership event, we need to get the state for each state entry.
if canShortCircuit { if canShortCircuit {
if i == 0 { if len(memberships) == 0 {
memberships, err = helpers.GetMembershipsAtState(ctx, r.DB, stateEntry, false) memberships, err = helpers.GetMembershipsAtState(ctx, r.DB, stateEntry, false)
} }
} else { } else {