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

Notifications for a few merge-related scenarios

Browse source
This commit is contained in:
Scott Nonnenberg 2022-12-05 14:46:54 -08:00 • committed by GitHub
parent 78ce34b9d3
commit a49a6f2057
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 2764 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ts/util/lookupConversationWithoutUuid.ts
View file

@ -76,13 +76,14 @@ export async function lookupConversationWithoutUuid(
const maybePair = serverLookup.get(options.e164);
if (maybePair) {
const convo = window.ConversationController.maybeMergeContacts({
aci: maybePair.aci,
pni: maybePair.pni,
e164: options.e164,
reason: 'startNewConversationWithoutUuid(e164)',
});
conversationId = convo?.id;
const { conversation } =
window.ConversationController.maybeMergeContacts({
aci: maybePair.aci,
pni: maybePair.pni,
e164: options.e164,
reason: 'startNewConversationWithoutUuid(e164)',
});
conversationId = conversation?.id;
}
} else {
const foundUsername = await checkForUsername(options.username);