From 3580dcb9a462f2679546f1a43178a3428a885bea Mon Sep 17 00:00:00 2001 From: Evan Feenstra Date: Fri, 11 Dec 2020 14:20:51 -0800 Subject: [PATCH] fix --- dist/src/controllers/contacts.js | 6 +++--- dist/src/controllers/contacts.js.map | 2 +- src/controllers/contacts.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/src/controllers/contacts.js b/dist/src/controllers/contacts.js index 128169f..4a40228 100644 --- a/dist/src/controllers/contacts.js +++ b/dist/src/controllers/contacts.js @@ -212,10 +212,10 @@ exports.receiveContactKey = (payload) => __awaiter(void 0, void 0, void 0, funct const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key, status: constants_1.default.contact_statuses.confirmed } }); let msgIncludedContactKey = false; // ??????? + if (sender_contact_key) { + msgIncludedContactKey = true; + } if (sender_contact_key && sender) { - if (sender_contact_key !== sender.contactKey) { - msgIncludedContactKey = true; - } const objToUpdate = { contactKey: sender_contact_key }; if (sender_alias) objToUpdate.alias = sender_alias; diff --git a/dist/src/controllers/contacts.js.map b/dist/src/controllers/contacts.js.map index 450ca4d..0a758e7 100644 --- a/dist/src/controllers/contacts.js.map +++ b/dist/src/controllers/contacts.js.map @@ -1 +1 @@ -{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"contacts.js","sourceRoot":"","sources":["../../../src/controllers/contacts.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/controllers/contacts.ts b/src/controllers/contacts.ts index 9bef16e..937f1f6 100644 --- a/src/controllers/contacts.ts +++ b/src/controllers/contacts.ts @@ -234,10 +234,10 @@ export const receiveContactKey = async (payload) => { const owner = await models.Contact.findOne({ where: { isOwner: true } }) const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key, status: constants.contact_statuses.confirmed } }) let msgIncludedContactKey = false // ??????? + if(sender_contact_key) { + msgIncludedContactKey = true + } if (sender_contact_key && sender) { - if (sender_contact_key !== sender.contactKey) { - msgIncludedContactKey = true - } const objToUpdate: { [k: string]: any } = { contactKey: sender_contact_key } if (sender_alias) objToUpdate.alias = sender_alias if (sender_photo_url) objToUpdate.photoUrl = sender_photo_url