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

Fix storage mergeCallLinkRecord deletedAt handling

Browse source 
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-10-15 21:28:50 -05:00 committed by GitHub
parent 6cc07a4d17
commit c068cb7bd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ts/services/storageRecordOps.ts
View file

@ -1974,14 +1974,16 @@ export async function mergeCallLinkRecord(
const localCallLinkDbRecord =
await DataReader.getCallLinkRecordByRoomId(roomId);
const deletedAt: number | null =
callLinkRecord.deletedAtTimestampMs != null
? getTimestampFromLong(callLinkRecord.deletedAtTimestampMs)
: null;
const shouldDrop =
deletedAt != null && isOlderThan(deletedAt, getMessageQueueTime());
// Note deletedAtTimestampMs can be 0
const deletedAtTimestampMs = callLinkRecord.deletedAtTimestampMs?.toNumber();
const deletedAt = deletedAtTimestampMs || null;
const shouldDrop = Boolean(
deletedAt && isOlderThan(deletedAt, getMessageQueueTime())
);
if (shouldDrop) {
details.push('expired deleted call link; scheduling for removal');
details.push(
`expired deleted call link deletedAt=${deletedAt}; scheduling for removal`
);
}
const callLinkDbRecord: CallLinkRecord = {
@ -2005,7 +2007,9 @@ export async function mergeCallLinkRecord(
if (!localCallLinkDbRecord) {
if (deletedAt) {
details.push('skipping deleted call link with no matching local record');
details.push(
`skipping deleted call link with no matching local record deletedAt=${deletedAt}`
);
} else if (await DataReader.defunctCallLinkExists(roomId)) {
details.push('skipping known defunct call link');
} else {
@ -2022,7 +2026,7 @@ export async function mergeCallLinkRecord(
storageID: callLink.storageID,
storageVersion: callLink.storageVersion,
storageUnknownFields: callLink.storageUnknownFields,
source: 'storage.mergeCallLinkRecord',
source: `storage.mergeCallLinkRecord(${redactedStorageID})`,
})
);
}