Split ACI contact when it is unregistered
This commit is contained in:
parent
a5a6b74f98
commit
63d6b14516
11 changed files with 317 additions and 81 deletions
|
@ -964,10 +964,6 @@ export async function mergeContactRecord(
|
|||
reason: 'mergeContactRecord',
|
||||
});
|
||||
|
||||
if (!conversation) {
|
||||
throw new Error(`No conversation for ${storageID}`);
|
||||
}
|
||||
|
||||
// We're going to ignore this; it's likely a PNI-only contact we've already merged
|
||||
if (conversation.get('uuid') !== uuid) {
|
||||
log.warn(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue