colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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/lookupConversationWithoutServiceId.ts
View File

@@ -41,7 +41,7 @@ export type LookupConversationWithoutServiceIdOptionsType = Omit<
>;
type FoundUsernameType = {
uuid: AciString;
aci: AciString;
username: string;
};
@@ -51,7 +51,7 @@ export async function lookupConversationWithoutServiceId(
const knownConversation = window.ConversationController.get(
options.type === 'e164' ? options.e164 : options.username
);
if (knownConversation && knownConversation.get('uuid')) {
if (knownConversation && knownConversation.getServiceId()) {
return knownConversation.id;
}
@@ -89,7 +89,7 @@ export async function lookupConversationWithoutServiceId(
const foundUsername = await checkForUsername(options.username);
if (foundUsername) {
const convo = window.ConversationController.lookupOrCreate({
uuid: foundUsername.uuid,
serviceId: foundUsername.aci,
reason: 'lookupConversationWithoutServiceId',
});
@@ -159,7 +159,7 @@ async function checkForUsername(
}
return {
uuid: account.uuid,
aci: account.uuid,
username,
};
} catch (error) {