From 26e338807f59304959dcd9edc9801c146447966e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 23 Nov 2017 14:13:20 +0000 Subject: [PATCH] Shuffle and comment --- .../matrix-org/dendrite/roomserver/query/query.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/github.com/matrix-org/dendrite/roomserver/query/query.go b/src/github.com/matrix-org/dendrite/roomserver/query/query.go index 611c57b60..284327879 100644 --- a/src/github.com/matrix-org/dendrite/roomserver/query/query.go +++ b/src/github.com/matrix-org/dendrite/roomserver/query/query.go @@ -489,9 +489,6 @@ func getAuthChain( // Set of events we've already fetched. fetchedEventMap := make(map[string]bool) - for _, eventID := range authEventIDs { - fetchedEventMap[eventID] = true - } // Check if there's anything left to do for len(eventsToFetch) > 0 { @@ -506,14 +503,17 @@ func getAuthChain( // add them to the list of events to fetch. eventsToFetch = eventsToFetch[:0] for _, event := range events { + fetchedEventMap[event.EventID()] = true + authEvents = append(authEvents, event.Event) + + // Now we need to fetch any auth events that we haven't + // previously seen. for _, authEventID := range event.AuthEventIDs() { if !fetchedEventMap[authEventID] { fetchedEventMap[authEventID] = true eventsToFetch = append(eventsToFetch, authEventID) } } - - authEvents = append(authEvents, event.Event) } }