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

Migrate schema to service ids

Browse source
This commit is contained in:
Fedor Indutny 2023-08-16 22:54:39 +02:00 • committed by Jamie Kyle
parent 71958f8a01
commit 8b0da36caa
258 changed files with 4795 additions and 2613 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/util/validateConversation.ts
View file

@ -12,8 +12,8 @@ export function validateConversation(
return `Invalid conversation type: ${attributes.type}`;
}
if (!attributes.e164 && !attributes.uuid && !attributes.groupId) {
return 'Missing one of e164, uuid, or groupId';
if (!attributes.e164 && !attributes.serviceId && !attributes.groupId) {
return 'Missing one of e164, serviceId, or groupId';
}
const error = validateNumber(attributes) || validateServiceId(attributes);
@ -41,8 +41,8 @@ function validateNumber(attributes: ValidateConversationType): string | null {
function validateServiceId(
attributes: ValidateConversationType
): string | null {
if (isDirectConversation(attributes) && attributes.uuid) {
if (isServiceIdString(attributes.uuid)) {
if (isDirectConversation(attributes) && attributes.serviceId) {
if (isServiceIdString(attributes.serviceId)) {
return null;
}