Sort message-initiated timer updates before the initiating message

This commit is contained in:
Scott Nonnenberg 2022-03-28 17:25:11 -07:00 committed by GitHub
parent 918616e6ab
commit e62606361d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 22 deletions

View file

@ -2618,13 +2618,10 @@ export async function startApp(): Promise<void> {
const { expireTimer } = details;
const isValidExpireTimer = typeof expireTimer === 'number';
if (isValidExpireTimer) {
const ourId = window.ConversationController.getOurConversationId();
const receivedAt = Date.now();
await conversation.updateExpirationTimer(
expireTimer,
ourId,
receivedAt,
window.ConversationController.getOurConversationId(),
undefined,
{
fromSync: true,
}
@ -2717,11 +2714,10 @@ export async function startApp(): Promise<void> {
return;
}
const receivedAt = Date.now();
await conversation.updateExpirationTimer(
expireTimer,
window.ConversationController.getOurConversationId(),
receivedAt,
undefined,
{
fromSync: true,
}