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

DRY up the message receive timing validation

Browse source
This commit is contained in:
Josh Perez 2023-09-12 16:12:07 -04:00 • committed by GitHub
parent 7ea945c157
commit 944a70abe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/util/deleteForEveryone.ts
View file

@ -4,10 +4,10 @@
import type { DeleteAttributesType } from '../messageModifiers/Deletes';
import type { MessageModel } from '../models/messages';
import * as log from '../logging/log';
import { DAY } from './durations';
import { isMe } from './whatTypeOfConversation';
import { getContactId } from '../messages/helpers';
import { isStory } from '../state/selectors/message';
import { isTooOldToModifyMessage } from './isTooOldToModifyMessage';
export async function deleteForEveryone(
message: MessageModel,
@ -33,7 +33,7 @@ export async function deleteForEveryone(
return;
}
if (isDeletionTooOld(message, doe)) {
if (isTooOldToModifyMessage(doe.serverTimestamp, message.attributes)) {
log.warn('Received late DOE. Dropping.', {
fromId: doe.fromId,
targetSentTimestamp: doe.targetSentTimestamp,
@ -58,13 +58,3 @@ function isDeletionByMe(
doe.fromId === ourConversationId
);
}
function isDeletionTooOld(
message: Readonly<MessageModel>,
doe: Pick<DeleteAttributesType, 'serverTimestamp'>
): boolean {
const messageTimestamp =
message.get('serverTimestamp') || message.get('sent_at') || 0;
const delta = Math.abs(doe.serverTimestamp - messageTimestamp);
return delta > DAY * 2;
}