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

Resolve state

Browse source
This commit is contained in:
Neil Alexander 2020-10-14 11:52:32 +01:00
parent 8fce60c746
commit 077a23fea0
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
roomserver/internal/query/query.go
View file

@ -49,6 +49,7 @@ func (r *Queryer) QueryLatestEventsAndState(
} }
// QueryStateAfterEvents implements api.RoomserverInternalAPI // QueryStateAfterEvents implements api.RoomserverInternalAPI
// nolint:gocyclo
func (r *Queryer) QueryStateAfterEvents( func (r *Queryer) QueryStateAfterEvents(
ctx context.Context, ctx context.Context,
request *api.QueryStateAfterEventsRequest, request *api.QueryStateAfterEventsRequest,
@ -81,7 +82,6 @@ func (r *Queryer) QueryStateAfterEvents(
var stateEntries []types.StateEntry var stateEntries []types.StateEntry
if len(request.StateToFetch) == 0 { if len(request.StateToFetch) == 0 {
// Look up all of the current room state. // Look up all of the current room state.
// TODO: This can return duplicate state-key tuples, is this a problem?
stateEntries, err = roomState.LoadCombinedStateAfterEvents( stateEntries, err = roomState.LoadCombinedStateAfterEvents(
ctx, prevStates, ctx, prevStates,
) )
@ -100,6 +100,24 @@ func (r *Queryer) QueryStateAfterEvents(
return err return err
} }
if len(request.PrevEventIDs) > 1 && len(request.StateToFetch) == 0 {
var authEventIDs []string
for _, e := range stateEvents {
authEventIDs = append(authEventIDs, e.AuthEventIDs()...)
}
authEventIDs = util.UniqueStrings(authEventIDs)
authEvents, err := getAuthChain(ctx, r.DB.EventsFromIDs, authEventIDs)
if err != nil {
return fmt.Errorf("getAuthChain: %w", err)
}
stateEvents, err = state.ResolveConflictsAdhoc(info.RoomVersion, stateEvents, authEvents)
if err != nil {
return fmt.Errorf("state.ResolveConflictsAdhoc: %w", err)
}
}
for _, event := range stateEvents { for _, event := range stateEvents {
response.StateEvents = append(response.StateEvents, event.Headered(info.RoomVersion)) response.StateEvents = append(response.StateEvents, event.Headered(info.RoomVersion))
} }