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

Drop messages earlier in backup import

Browse source
This commit is contained in:
Fedor Indutny 2024-09-10 11:15:07 -07:00 committed by GitHub
parent 2ed02462a1
commit 94245a45db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
ts/services/backups/import.ts
View file

@ -54,6 +54,7 @@ import type {
import { assertDev, strictAssert } from '../../util/assert';
import { getTimestampFromLong } from '../../util/timestampLongUtils';
import { DurationInSeconds, SECOND } from '../../util/durations';
import { calculateExpirationTimestamp } from '../../util/expirationTimer';
import { dropNull } from '../../util/dropNull';
import {
deriveGroupID,
@ -249,6 +250,7 @@ function addressToContactAddressType(
}
export class BackupImportStream extends Writable {
private now = Date.now();
private parsedBackupInfo = false;
private logId = 'BackupImportStream(unknown)';
private aboutMe: AboutMe | undefined;
@ -777,7 +779,7 @@ export class BackupImportStream extends Writable {
if (contact.notRegistered) {
const timestamp =
contact.notRegistered.unregisteredTimestamp?.toNumber() ?? Date.now();
contact.notRegistered.unregisteredTimestamp?.toNumber() ?? this.now;
attrs.discoveredUnregisteredAt = timestamp;
attrs.firstUnregisteredAt = timestamp;
} else {
@ -1182,6 +1184,25 @@ export class BackupImportStream extends Writable {
chatConvo.unreadCount = (chatConvo.unreadCount ?? 0) + 1;
}
const expirationStartTimestamp =
item.expireStartDate && !item.expireStartDate.isZero()
? getTimestampFromLong(item.expireStartDate)
: undefined;
const expireTimer =
item.expiresInMs && !item.expiresInMs.isZero()
? DurationInSeconds.fromMillis(item.expiresInMs.toNumber())
: undefined;
const expirationTimestamp = calculateExpirationTimestamp({
expireTimer,
expirationStartTimestamp,
});
if (expirationTimestamp != null && expirationTimestamp < this.now) {
// Drop expired messages
return;
}
let attributes: MessageAttributesType = {
id: generateUuid(),
conversationId: chatConvo.id,
@ -1191,14 +1212,8 @@ export class BackupImportStream extends Writable {
sourceServiceId: authorConvo?.serviceId,
timestamp,
type: item.outgoing != null ? 'outgoing' : 'incoming',
expirationStartTimestamp:
item.expireStartDate && !item.expireStartDate.isZero()
? getTimestampFromLong(item.expireStartDate)
: undefined,
expireTimer:
item.expiresInMs && !item.expiresInMs.isZero()
? DurationInSeconds.fromMillis(item.expiresInMs.toNumber())
: undefined,
expirationStartTimestamp,
expireTimer,
sms: item.sms === true ? true : undefined,
...directionDetails,
};
@ -1400,7 +1415,7 @@ export class BackupImportStream extends Writable {
};
}
if (incoming) {
const receivedAtMs = incoming.dateReceived?.toNumber() ?? Date.now();
const receivedAtMs = incoming.dateReceived?.toNumber() ?? this.now;
const unidentifiedDeliveryReceived = incoming.sealedSender === true;