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

Allow both UUIDv4/v7 for message ids

Browse source
This commit is contained in:
Fedor Indutny 2024-10-08 14:44:14 -07:00 committed by GitHub
parent d3bcace72c
commit a1be616e6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ts/sql/Client.ts
View file

@ -18,7 +18,7 @@ import { cleanDataForIpc } from './cleanDataForIpc';
import type { AciString, ServiceIdString } from '../types/ServiceId'; import type { AciString, ServiceIdString } from '../types/ServiceId';
import createTaskWithTimeout from '../textsecure/TaskWithTimeout'; import createTaskWithTimeout from '../textsecure/TaskWithTimeout';
import * as log from '../logging/log'; import * as log from '../logging/log';
import { isValidUuidV7 } from '../util/isValidUuid'; import { isValidUuid, isValidUuidV7 } from '../util/isValidUuid';
import * as Errors from '../types/errors'; import * as Errors from '../types/errors';
import type { StoredJob } from '../jobs/types'; import type { StoredJob } from '../jobs/types';
@ -603,7 +603,12 @@ async function saveMessage(
jobToInsert: options.jobToInsert && formatJobForInsert(options.jobToInsert), jobToInsert: options.jobToInsert && formatJobForInsert(options.jobToInsert),
}); });
softAssert(isValidUuidV7(id), 'saveMessage: messageId is not a UUID'); softAssert(
// Older messages still have `UUIDv4` so don't log errors when encountering
// it.
(!options.forceSave && isValidUuid(id)) || isValidUuidV7(id),
'saveMessage: messageId is not a UUID'
);
void updateExpiringMessagesService(); void updateExpiringMessagesService();
void tapToViewMessagesDeletionService.update(); void tapToViewMessagesDeletionService.update();