historysync: fix backfill logic again

* INITIAL_BOOTSTRAP doesn't have 100% as the progress
* Enqueue deferred backfills after both RECENT and FULL progress gets to
  the necessary levels
This commit is contained in:
Sumner Evans 2022-04-13 10:15:42 -06:00
parent 8f4eedb75e
commit daed67420c
No known key found for this signature in database
GPG key ID: 8904527AB50022FD

View file

@ -242,16 +242,7 @@ func (user *User) handleHistorySync(reCheckQueue chan bool, evt *waProto.History
// most recent portals. If it's the last history sync event, start // most recent portals. If it's the last history sync event, start
// backfilling the rest of the history of the portals. // backfilling the rest of the history of the portals.
if user.bridge.Config.Bridge.HistorySync.Backfill { if user.bridge.Config.Bridge.HistorySync.Backfill {
if evt.GetProgress() < 99 { if evt.GetSyncType() != waProto.HistorySync_INITIAL_BOOTSTRAP && evt.GetProgress() < 98 {
return
}
doneSyncType := waProto.HistorySync_RECENT
if user.bridge.Config.Bridge.HistorySync.RequestFullSync {
doneSyncType = waProto.HistorySync_FULL
}
if evt.GetSyncType() != waProto.HistorySync_INITIAL_BOOTSTRAP && evt.GetSyncType() != doneSyncType {
return return
} }