Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Early preparations for PNP Contact Merging

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-08-09 14:39:00 -07:00
committed by GitHub
parent 2f5dd73e58
commit faf6c41332
30 changed files with 1572 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ts/updateConversationsWithUuidLookup.ts
View File

@@ -15,7 +15,7 @@ export async function updateConversationsWithUuidLookup({
}: Readonly<{
conversationController: Pick<
ConversationController,
'ensureContactIds' | 'get'
'maybeMergeContacts' | 'get'
>;
conversations: ReadonlyArray<ConversationModel>;
messaging: Pick<SendMessage, 'getUuidsForE164s' | 'checkAccountExistence'>;
@@ -40,14 +40,12 @@ export async function updateConversationsWithUuidLookup({
const uuidFromServer = getOwn(serverLookup, e164);
if (uuidFromServer) {
const finalConversationId = conversationController.ensureContactIds({
e164,
uuid: uuidFromServer,
highTrust: true,
reason: 'updateConversationsWithUuidLookup',
});
const maybeFinalConversation =
conversationController.get(finalConversationId);
conversationController.maybeMergeContacts({
aci: uuidFromServer,
e164,
reason: 'updateConversationsWithUuidLookup',
});
assert(
maybeFinalConversation,
'updateConversationsWithUuidLookup: expected a conversation to be found or created'