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

backfill status event: send after room exists

Browse source
This commit is contained in:
Sumner Evans 2022-05-24 15:13:31 -06:00
parent b850995888
commit 03d46630c2
No known key found for this signature in database
GPG key ID: 8904527AB50022FD
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
historysync.go
View file

@ -132,17 +132,16 @@ func (user *User) backfillInChunks(req *database.Backfill, conv *database.Histor
portal.backfillLock.Lock() portal.backfillLock.Lock()
defer portal.backfillLock.Unlock() defer portal.backfillLock.Unlock()
if !user.shouldCreatePortalForHistorySync(conv, portal) {
return
}
backfillState := user.bridge.DB.Backfill.GetBackfillState(user.MXID, &portal.Key) backfillState := user.bridge.DB.Backfill.GetBackfillState(user.MXID, &portal.Key)
if backfillState == nil { if backfillState == nil {
backfillState = user.bridge.DB.Backfill.NewBackfillState(user.MXID, &portal.Key) backfillState = user.bridge.DB.Backfill.NewBackfillState(user.MXID, &portal.Key)
} }
backfillState.SetProcessingBatch(true) backfillState.SetProcessingBatch(true)
defer backfillState.SetProcessingBatch(false) defer backfillState.SetProcessingBatch(false)
portal.updateBackfillStatus(backfillState)
if !user.shouldCreatePortalForHistorySync(conv, portal) {
return
}
var forwardPrevID id.EventID var forwardPrevID id.EventID
var timeEnd *time.Time var timeEnd *time.Time
@ -194,6 +193,9 @@ func (user *User) backfillInChunks(req *database.Backfill, conv *database.Histor
} }
} }
// Update the backfill status here after the room has been created.
portal.updateBackfillStatus(backfillState)
if sendDisappearedNotice { if sendDisappearedNotice {
user.log.Debugfln("Sending notice to %s that there are disappeared messages ending at %v", portal.Key.JID, conv.LastMessageTimestamp) user.log.Debugfln("Sending notice to %s that there are disappeared messages ending at %v", portal.Key.JID, conv.LastMessageTimestamp)
resp, err := portal.sendMessage(portal.MainIntent(), event.EventMessage, &event.MessageEventContent{ resp, err := portal.sendMessage(portal.MainIntent(), event.EventMessage, &event.MessageEventContent{
@ -735,7 +737,7 @@ func (portal *Portal) updateBackfillStatus(backfillState *database.BackfillState
"first_timestamp": backfillState.FirstExpectedTimestamp, "first_timestamp": backfillState.FirstExpectedTimestamp,
}) })
if err != nil { if err != nil {
portal.log.Errorln("Error sending backfill status dummy event:", err) portal.log.Errorln("Error sending backfill status event:", err)
} }
} }