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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 1572 additions and 447 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/messageModifiers/MessageRequests.ts
View file

@ -103,12 +103,10 @@ export class MessageRequests extends Collection<MessageRequestModel> {
conversation = window.ConversationController.get(groupId);
}
if (!conversation && (threadE164 || threadUuid)) {
conversation = window.ConversationController.get(
window.ConversationController.ensureContactIds({
e164: threadE164,
uuid: threadUuid,
})
);
conversation = window.ConversationController.lookupOrCreate({
e164: threadE164,
uuid: threadUuid,
});
}
if (!conversation) {