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

Disappearing message cleanups

Browse source
This commit is contained in:
Evan Hahn 2021-06-16 17:20:17 -05:00 • committed by GitHub
parent dfa6fb5d61
commit 03a187097f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 149 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/delivery_receipts.js
View file

@ -1,4 +1,4 @@
// Copyright 2016-2020 Signal Messenger, LLC
// Copyright 2016-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global
@ -96,11 +96,6 @@
sent: true,
});
if (message.isExpiring() && !expirationStartTimestamp) {
// TODO DESKTOP-1509: use setToExpire once this is TS
await message.setToExpire(false, { skipSave: true });
}
window.Signal.Util.queueUpdateMessage(message.attributes);
// notify frontend listeners

27
js/expiring_messages.js
View file

@ -1,4 +1,4 @@
// Copyright 2016-2020 Signal Messenger, LLC
// Copyright 2016-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global
@ -17,6 +17,9 @@
const messages = await window.Signal.Data.getExpiredMessages({
MessageCollection: Whisper.MessageCollection,
});
window.log.info(
`destroyExpiredMessages: found ${messages.length} messages to expire`
);
const messageIds = [];
const inMemoryMessages = [];
@ -59,20 +62,15 @@
let timeout;
async function checkExpiringMessages() {
// Look up the next expiring message and set a timer to destroy it
const message = await window.Signal.Data.getNextExpiringMessage({
Message: Whisper.Message,
});
window.log.info('checkExpiringMessages: checking for expiring messages');
if (!message) {
const soonestExpiry = await window.Signal.Data.getSoonestMessageExpiry();
if (!soonestExpiry) {
window.log.info('checkExpiringMessages: found no messages to expire');
return;
}
const expiresAt = message.get('expires_at');
Whisper.ExpiringMessagesListener.nextExpiration = expiresAt;
window.log.info('next message expires', new Date(expiresAt).toISOString());
let wait = expiresAt - Date.now();
let wait = soonestExpiry - Date.now();
// In the past
if (wait < 0) {
@ -84,6 +82,12 @@
wait = 2147483647;
}
window.log.info(
`checkExpiringMessages: next message expires ${new Date(
soonestExpiry
).toISOString()}; waiting ${wait} ms before clearing`
);
clearTimeout(timeout);
timeout = setTimeout(destroyExpiredMessages, wait);
}
@ -93,7 +97,6 @@
);
Whisper.ExpiringMessagesListener = {
nextExpiration: null,
init(events) {
checkExpiringMessages();
events.on('timetravel', debouncedCheckExpiringMessages);

7
js/read_receipts.js
View file

@ -1,4 +1,4 @@
// Copyright 2016-2020 Signal Messenger, LLC
// Copyright 2016-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global
@ -97,11 +97,6 @@
sent: true,
});
if (message.isExpiring() && !expirationStartTimestamp) {
// TODO DESKTOP-1509: use setToExpire once this is TS
await message.setToExpire(false, { skipSave: true });
}
window.Signal.Util.queueUpdateMessage(message.attributes);
// notify frontend listeners

6
js/read_syncs.js
View file

@ -1,4 +1,4 @@
// Copyright 2017-2020 Signal Messenger, LLC
// Copyright 2017-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* global
@ -120,10 +120,6 @@
);
message.set({ expirationStartTimestamp });
const force = true;
// TODO DESKTOP-1509: use setToExpire once this is TS
await message.setToExpire(force, { skipSave: true });
const conversation = message.getConversation();
if (conversation) {
conversation.trigger('expiration-change', message);