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

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

5
ts/util/handleEditMessage.ts
View file

@ -10,7 +10,6 @@ import type {
} from '../model-types.d';
import type { LinkPreviewType } from '../types/message/LinkPreviews';
import * as Edits from '../messageModifiers/Edits';
import * as durations from './durations';
import * as log from '../logging/log';
import { ReadStatus } from '../messages/MessageReadStatus';
import dataInterface from '../sql/Client';
@ -20,8 +19,8 @@ import { isAciString } from '../types/ServiceId';
import { getMessageIdForLogging } from './idForLogging';
import { hasErrors } from '../state/selectors/message';
import { isIncoming, isOutgoing } from '../messages/helpers';
import { isOlderThan } from './timestamp';
import { isDirectConversation } from './whatTypeOfConversation';
import { isTooOldToModifyMessage } from './isTooOldToModifyMessage';
import { queueAttachmentDownloads } from './queueAttachmentDownloads';
import { modifyTargetMessage } from './modifyTargetMessage';
@ -84,7 +83,7 @@ export async function handleEditMessage(
if (
serverTimestamp &&
!isNoteToSelf &&
isOlderThan(serverTimestamp, durations.DAY * 2)
isTooOldToModifyMessage(serverTimestamp, mainMessage)
) {
log.warn(`${idLog}: cannot edit message older than 48h`, serverTimestamp);
return;