tileradotorg/mautrix-whatsapp
1
0
Fork 0
forked from MirrorHub/mautrix-whatsapp
Code Pull requests Activity

Merge pull request #468 from mautrix/sumner/bri-2852-2

Browse source 
historysync: refactor backfill enqueue logic
This commit is contained in:
Sumner Evans 2022-04-12 09:21:15 -06:00 committed by GitHub
commit 8f4eedb75e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
historysync.go
View file

@ -241,7 +241,20 @@ 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 || evt.GetSyncType() == waProto.HistorySync_RECENT) { if user.bridge.Config.Bridge.HistorySync.Backfill {
if evt.GetProgress() < 99 {
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
}
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)
@ -256,12 +269,10 @@ func (user *User) handleHistorySync(reCheckQueue chan bool, evt *waProto.History
// 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, waProto.HistorySync_RECENT: 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