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

Fallback to sent_at when serverTimestamp is empty

Browse source
This commit is contained in:
Fedor Indutny 2021-08-13 09:02:28 -07:00 • committed by GitHub
parent b7447cda29
commit b2e2e6d8eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ts/util/deleteForEveryone.ts
View file

@ -11,16 +11,19 @@ export async function deleteForEveryone(
doe: DeleteModel, doe: DeleteModel,
shouldPersist = true shouldPersist = true
): Promise<void> { ): Promise<void> {
const messageTimestamp =
message.get('serverTimestamp') || message.get('sent_at') || 0;
// Make sure the server timestamps for the DOE and the matching message // Make sure the server timestamps for the DOE and the matching message
// are less than one day apart // are less than one day apart
const delta = Math.abs( const delta = Math.abs(doe.get('serverTimestamp') - messageTimestamp);
doe.get('serverTimestamp') - (message.get('serverTimestamp') || 0)
);
if (delta > ONE_DAY) { if (delta > ONE_DAY) {
window.log.info('Received late DOE. Dropping.', { window.log.info('Received late DOE. Dropping.', {
fromId: doe.get('fromId'), fromId: doe.get('fromId'),
targetSentTimestamp: doe.get('targetSentTimestamp'), targetSentTimestamp: doe.get('targetSentTimestamp'),
messageServerTimestamp: message.get('serverTimestamp'), messageServerTimestamp: message.get('serverTimestamp'),
messageSentAt: message.get('sent_at'),
deleteServerTimestamp: doe.get('serverTimestamp'), deleteServerTimestamp: doe.get('serverTimestamp'),
}); });
return; return;