historysync: start deferred backfill on non-full syncs

Co-authored-by: Tulir Asokan <tulir@maunium.net>
This commit is contained in:
Sumner Evans 2022-04-05 12:28:58 -06:00
parent 748c9509a1
commit a8be4b11a8
No known key found for this signature in database
GPG key ID: 8904527AB50022FD

View file

@ -239,7 +239,7 @@ func (user *User) handleHistorySync(reCheckQueue chan bool, evt *waProto.History
// If this was the initial bootstrap, enqueue immediate backfills for the // If this was the initial bootstrap, enqueue immediate backfills for the
// 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 && (evt.GetSyncType() == waProto.HistorySync_INITIAL_BOOTSTRAP || evt.GetSyncType() == waProto.HistorySync_FULL) { if user.bridge.Config.Bridge.HistorySync.Backfill && (evt.GetSyncType() == waProto.HistorySync_INITIAL_BOOTSTRAP || evt.GetSyncType() == waProto.HistorySync_FULL || evt.GetSyncType() == waProto.HistorySync_RECENT) {
nMostRecent := user.bridge.DB.HistorySyncQuery.GetNMostRecentConversations(user.MXID, user.bridge.Config.Bridge.HistorySync.MaxInitialConversations) nMostRecent := user.bridge.DB.HistorySyncQuery.GetNMostRecentConversations(user.MXID, user.bridge.Config.Bridge.HistorySync.MaxInitialConversations)
for i, conv := range nMostRecent { for i, conv := range nMostRecent {
jid, err := types.ParseJID(conv.ConversationID) jid, err := types.ParseJID(conv.ConversationID)
@ -253,11 +253,13 @@ func (user *User) handleHistorySync(reCheckQueue chan bool, evt *waProto.History
case waProto.HistorySync_INITIAL_BOOTSTRAP: case waProto.HistorySync_INITIAL_BOOTSTRAP:
// Enqueue immediate backfills for the most recent messages first. // Enqueue immediate backfills for the most recent messages first.
user.EnqueueImmedateBackfill(portal, i) user.EnqueueImmedateBackfill(portal, i)
case waProto.HistorySync_FULL: case waProto.HistorySync_FULL, waProto.HistorySync_RECENT:
if evt.GetProgress() >= 99 {
// Enqueue deferred backfills as configured. // Enqueue deferred backfills as configured.
user.EnqueueDeferredBackfills(portal, len(nMostRecent), i) user.EnqueueDeferredBackfills(portal, len(nMostRecent), i)
} }
} }
}
// Tell the queue to check for new backfill requests. // Tell the queue to check for new backfill requests.
reCheckQueue <- true reCheckQueue <- true