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

Adjust forward elatest events updater

Browse source
This commit is contained in:
Neil Alexander 2020-12-09 12:28:22 +00:00
parent f64c8822bc
commit 0c86d974b2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roomserver/internal/input/input_latest_events.go
View file

@ -290,11 +290,9 @@ func (u *latestEventsUpdater) calculateLatest(
// If the "new" event is already a forward extremity then stop, as // If the "new" event is already a forward extremity then stop, as
// nothing changes. // nothing changes.
for _, event := range events { if _, ok := existingRefs[newEvent.EventID()]; ok {
if event.EventID() == newEvent.EventID() {
return false, nil return false, nil
} }
}
// Include our new event in the extremities. // Include our new event in the extremities.
newLatest := []types.StateAtEventAndReference{newStateAndRef} newLatest := []types.StateAtEventAndReference{newStateAndRef}
@ -306,14 +304,6 @@ func (u *latestEventsUpdater) calculateLatest(
delete(existingRefs, prevEventID) delete(existingRefs, prevEventID)
} }
// Ensure that we don't add any candidate forward extremities from
// the old set that are, themselves, referenced by the old set of
// forward extremities. This shouldn't happen but guards against
// the possibility anyway.
for prevEventID := range existingPrevs {
delete(existingRefs, prevEventID)
}
// Then re-add any old extremities that are still valid after all. // Then re-add any old extremities that are still valid after all.
for _, old := range existingRefs { for _, old := range existingRefs {
newLatest = append(newLatest, *old) newLatest = append(newLatest, *old)