mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Set disappearing check timer reliably - on all message saves

Browse source
This commit is contained in:
Scott Nonnenberg 2018-08-02 21:12:27 -07:00
parent 9dd756f96a
commit 22613c8cc4
6 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

47
js/expiring_messages.js
View file

@ -11,28 +11,35 @@
window.Whisper = window.Whisper || {};
async function destroyExpiredMessages() {
const messages = await window.Signal.Data.getExpiredMessages({
MessageCollection: Whisper.MessageCollection,
});
try {
const messages = await window.Signal.Data.getExpiredMessages({
MessageCollection: Whisper.MessageCollection,
});
await Promise.all(
messages.map(async message => {
window.log.info('Message expired', {
sentAt: message.get('sent_at'),
});
await Promise.all(
messages.map(async message => {
window.log.info('Message expired', {
sentAt: message.get('sent_at'),
});
// We delete after the trigger to allow the conversation time to process
// the expiration before the message is removed from the database.
await window.Signal.Data.removeMessage(message.id, {
Message: Whisper.Message,
});
// We delete after the trigger to allow the conversation time to process
// the expiration before the message is removed from the database.
await window.Signal.Data.removeMessage(message.id, {
Message: Whisper.Message,
});
const conversation = message.getConversation();
if (conversation) {
conversation.trigger('expired', message);
}
})
);
const conversation = message.getConversation();
if (conversation) {
conversation.trigger('expired', message);
}
})
);
} catch (error) {
window.log.error(
'destroyExpiredMessages: Error deleting expired messages',
error && error.stack ? error.stack : error
);
}
checkExpiringMessages();
}
@ -50,6 +57,7 @@
}
const expiresAt = next.get('expires_at');
Whisper.ExpiringMessagesListener.nextExpiration = expiresAt;
window.log.info('next message expires', new Date(expiresAt).toISOString());
let wait = expiresAt - Date.now();
@ -73,6 +81,7 @@
);
Whisper.ExpiringMessagesListener = {
nextExpiration: null,
init(events) {
checkExpiringMessages();
events.on('timetravel', throttledCheckExpiringMessages);