Notifications for a few merge-related scenarios
This commit is contained in:
Scott Nonnenberg
GitHub
parent
78ce34b9d3
commit
a49a6f2057
40 changed files with 2764 additions and 553 deletions
|
|
@ -8,6 +8,7 @@ import { strictAssert } from '../util/assert';
|
|||
|
||||
import type { ConversationModel } from '../models/conversations';
|
||||
import type { UUIDStringType } from '../types/UUID';
|
||||
import type { SafeCombineConversationsParams } from '../ConversationController';
|
||||
|
||||
const ACI_1 = UUID.generate().toString();
|
||||
const ACI_2 = UUID.generate().toString();
|
||||
|
|
@ -26,17 +27,16 @@ type ParamsType = {
|
|||
|
||||
describe('ConversationController', () => {
|
||||
describe('maybeMergeContacts', () => {
|
||||
let mergeOldAndNew: (options: {
|
||||
logId: string;
|
||||
oldConversation: ConversationModel;
|
||||
newConversation: ConversationModel;
|
||||
}) => Promise<void>;
|
||||
let mergeOldAndNew: (
|
||||
options: SafeCombineConversationsParams
|
||||
) => Promise<void>;
|
||||
|
||||
beforeEach(async () => {
|
||||
await window.Signal.Data._removeAllConversations();
|
||||
|
||||
window.ConversationController.reset();
|
||||
await window.ConversationController.load();
|
||||
await window.textsecure.storage.protocol.hydrateCaches();
|
||||
|
||||
mergeOldAndNew = () => {
|
||||
throw new Error('mergeOldAndNew: Should not be called!');
|
||||
|
|
@ -145,21 +145,23 @@ describe('ConversationController', () => {
|
|||
|
||||
describe('non-destructive updates', () => {
|
||||
it('creates a new conversation with just ACI if no matches', () => {
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
});
|
||||
|
||||
const second = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: second } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(second, 'second', {
|
||||
aci: ACI_1,
|
||||
|
|
@ -168,21 +170,23 @@ describe('ConversationController', () => {
|
|||
assert.strictEqual(result?.id, second?.id, 'result and second match');
|
||||
});
|
||||
it('creates a new conversation with just e164 if no matches', () => {
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
e164: E164_1,
|
||||
});
|
||||
|
||||
const second = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: second } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(second, 'second', {
|
||||
e164: E164_1,
|
||||
|
|
@ -191,28 +195,30 @@ describe('ConversationController', () => {
|
|||
assert.strictEqual(result?.id, second?.id, 'result and second match');
|
||||
});
|
||||
it('creates a new conversation with e164+PNI if no matches', () => {
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
aci: PNI_1,
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const second = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: second } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(second, 'second', {
|
||||
aci: PNI_1,
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
});
|
||||
|
|
@ -220,13 +226,14 @@ describe('ConversationController', () => {
|
|||
assert.strictEqual(result?.id, second?.id, 'result and second match');
|
||||
});
|
||||
it('creates a new conversation with all data if no matches', () => {
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
|
|
@ -234,13 +241,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const second = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: second } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(second, 'second', {
|
||||
uuid: ACI_1,
|
||||
|
|
@ -258,11 +266,12 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
|
|
@ -280,12 +289,13 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
|
|
@ -302,13 +312,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -328,12 +339,13 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -348,13 +360,14 @@ describe('ConversationController', () => {
|
|||
uuid: ACI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -369,13 +382,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -390,13 +404,14 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -410,12 +425,13 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -429,13 +445,14 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -449,13 +466,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -475,12 +493,13 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -499,13 +518,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_2,
|
||||
pni: PNI_2,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_2,
|
||||
pni: PNI_2,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_2,
|
||||
|
|
@ -530,12 +550,14 @@ describe('ConversationController', () => {
|
|||
e164: E164_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
pni: PNI_2,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: PNI_2,
|
||||
pni: PNI_2,
|
||||
e164: E164_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_2,
|
||||
e164: E164_1,
|
||||
|
|
@ -556,13 +578,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_2,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_2,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -584,13 +607,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_2,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_2,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_2,
|
||||
e164: E164_1,
|
||||
|
|
@ -615,13 +639,14 @@ describe('ConversationController', () => {
|
|||
uuid: ACI_2,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_2,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_2,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(aciOnly, 'aciOnly', {
|
||||
uuid: ACI_2,
|
||||
e164: E164_1,
|
||||
|
|
@ -646,12 +671,13 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -672,12 +698,13 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_2,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_2,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_2,
|
||||
|
|
@ -693,10 +720,8 @@ describe('ConversationController', () => {
|
|||
);
|
||||
});
|
||||
it('deletes PNI-only previous conversation, adds it to e164 match', () => {
|
||||
mergeOldAndNew = ({ oldConversation }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(
|
||||
oldConversation.id
|
||||
);
|
||||
mergeOldAndNew = ({ obsolete }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(obsolete.id);
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
|
|
@ -707,12 +732,13 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -728,10 +754,8 @@ describe('ConversationController', () => {
|
|||
);
|
||||
});
|
||||
it('deletes previous conversation with PNI as UUID only, adds it to e164 match', () => {
|
||||
mergeOldAndNew = ({ oldConversation }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(
|
||||
oldConversation.id
|
||||
);
|
||||
mergeOldAndNew = ({ obsolete }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(obsolete.id);
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
|
|
@ -742,12 +766,13 @@ describe('ConversationController', () => {
|
|||
uuid: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: PNI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -763,10 +788,8 @@ describe('ConversationController', () => {
|
|||
);
|
||||
});
|
||||
it('deletes e164+PNI previous conversation, adds data to ACI match', () => {
|
||||
mergeOldAndNew = ({ oldConversation }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(
|
||||
oldConversation.id
|
||||
);
|
||||
mergeOldAndNew = ({ obsolete }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(obsolete.id);
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
|
|
@ -778,13 +801,14 @@ describe('ConversationController', () => {
|
|||
aci: ACI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -813,13 +837,14 @@ describe('ConversationController', () => {
|
|||
e164: E164_2,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -831,10 +856,8 @@ describe('ConversationController', () => {
|
|||
assert.strictEqual(result?.id, withACI?.id, 'result and withACI match');
|
||||
});
|
||||
it('handles three matching conversations: ACI-only, E164-only (deleted), and with PNI', () => {
|
||||
mergeOldAndNew = ({ oldConversation }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(
|
||||
oldConversation.id
|
||||
);
|
||||
mergeOldAndNew = ({ obsolete }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(obsolete.id);
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
|
|
@ -849,13 +872,14 @@ describe('ConversationController', () => {
|
|||
e164: E164_2,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
@ -868,10 +892,8 @@ describe('ConversationController', () => {
|
|||
assert.strictEqual(result?.id, withACI?.id, 'result and withACI match');
|
||||
});
|
||||
it('merges three matching conversations: ACI-only, E164-only (deleted), PNI-only (deleted)', () => {
|
||||
mergeOldAndNew = ({ oldConversation }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(
|
||||
oldConversation.id
|
||||
);
|
||||
mergeOldAndNew = ({ obsolete }) => {
|
||||
window.ConversationController.dangerouslyRemoveById(obsolete.id);
|
||||
return Promise.resolve();
|
||||
};
|
||||
|
||||
|
|
@ -885,13 +907,14 @@ describe('ConversationController', () => {
|
|||
pni: PNI_1,
|
||||
});
|
||||
|
||||
const result = window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
const { conversation: result } =
|
||||
window.ConversationController.maybeMergeContacts({
|
||||
mergeOldAndNew,
|
||||
aci: ACI_1,
|
||||
e164: E164_1,
|
||||
pni: PNI_1,
|
||||
reason,
|
||||
});
|
||||
expectPropsAndLookups(result, 'result', {
|
||||
uuid: ACI_1,
|
||||
e164: E164_1,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import { UUID } from '../../types/UUID';
|
|||
import { SignalProtocolStore } from '../../SignalProtocolStore';
|
||||
import type { ConversationModel } from '../../models/conversations';
|
||||
import * as KeyChangeListener from '../../textsecure/KeyChangeListener';
|
||||
import * as Bytes from '../../Bytes';
|
||||
|
||||
describe('KeyChangeListener', () => {
|
||||
let oldNumberId: string | undefined;
|
||||
|
|
@ -54,11 +55,10 @@ describe('KeyChangeListener', () => {
|
|||
window.ConversationController.reset();
|
||||
await window.ConversationController.load();
|
||||
|
||||
convo = window.ConversationController.dangerouslyCreateAndAdd({
|
||||
id: uuidWithKeyChange,
|
||||
type: 'private',
|
||||
});
|
||||
await window.Signal.Data.saveConversation(convo.attributes);
|
||||
convo = await window.ConversationController.getOrCreateAndWait(
|
||||
uuidWithKeyChange,
|
||||
'private'
|
||||
);
|
||||
|
||||
store = new SignalProtocolStore();
|
||||
await store.hydrateCaches();
|
||||
|
|
@ -78,8 +78,7 @@ describe('KeyChangeListener', () => {
|
|||
describe('When we have a conversation with this contact', () => {
|
||||
it('generates a key change notice in the private conversation with this contact', done => {
|
||||
const original = convo.addKeyChange;
|
||||
convo.addKeyChange = async keyChangedId => {
|
||||
assert.equal(uuidWithKeyChange, keyChangedId.toString());
|
||||
convo.addKeyChange = async () => {
|
||||
convo.addKeyChange = original;
|
||||
done();
|
||||
};
|
||||
|
|
@ -91,12 +90,15 @@ describe('KeyChangeListener', () => {
|
|||
let groupConvo: ConversationModel;
|
||||
|
||||
beforeEach(async () => {
|
||||
groupConvo = window.ConversationController.dangerouslyCreateAndAdd({
|
||||
id: 'groupId',
|
||||
type: 'group',
|
||||
members: [convo.id],
|
||||
});
|
||||
await window.Signal.Data.saveConversation(groupConvo.attributes);
|
||||
groupConvo = await window.ConversationController.getOrCreateAndWait(
|
||||
Bytes.toBinary(
|
||||
new Uint8Array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5])
|
||||
),
|
||||
'group',
|
||||
{
|
||||
members: [uuidWithKeyChange],
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
|
|
@ -108,8 +110,8 @@ describe('KeyChangeListener', () => {
|
|||
|
||||
it('generates a key change notice in the group conversation with this contact', done => {
|
||||
const original = groupConvo.addKeyChange;
|
||||
groupConvo.addKeyChange = async keyChangedId => {
|
||||
assert.equal(uuidWithKeyChange, keyChangedId.toString());
|
||||
groupConvo.addKeyChange = async (_, keyChangedId) => {
|
||||
assert.equal(uuidWithKeyChange, keyChangedId?.toString());
|
||||
groupConvo.addKeyChange = original;
|
||||
done();
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,10 @@ describe('updateConversationsWithUuidLookup', () => {
|
|||
e164?: string | null;
|
||||
aci?: string | null;
|
||||
reason?: string;
|
||||
}): ConversationModel | undefined {
|
||||
}): {
|
||||
conversation: ConversationModel | undefined;
|
||||
mergePromises: Array<Promise<void>>;
|
||||
} {
|
||||
assert(
|
||||
e164,
|
||||
'FakeConversationController is not set up for this case (E164 must be provided)'
|
||||
|
|
@ -59,21 +62,21 @@ describe('updateConversationsWithUuidLookup', () => {
|
|||
|
||||
if (convoE164 && convoUuid) {
|
||||
if (convoE164 === convoUuid) {
|
||||
return convoUuid;
|
||||
return { conversation: convoUuid, mergePromises: [] };
|
||||
}
|
||||
|
||||
convoE164.unset('e164');
|
||||
convoUuid.updateE164(e164);
|
||||
return convoUuid;
|
||||
return { conversation: convoUuid, mergePromises: [] };
|
||||
}
|
||||
|
||||
if (convoE164 && !convoUuid) {
|
||||
convoE164.updateUuid(normalizedUuid);
|
||||
return convoE164;
|
||||
return { conversation: convoE164, mergePromises: [] };
|
||||
}
|
||||
|
||||
assert.fail('FakeConversationController should never get here');
|
||||
return undefined;
|
||||
return { conversation: undefined, mergePromises: [] };
|
||||
}
|
||||
|
||||
lookupOrCreate({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue