From a13bfe76a061ea5e5b332ec3e82a1410667f7eac Mon Sep 17 00:00:00 2001 From: phegalante Date: Tue, 8 Sep 2020 20:11:31 -0300 Subject: [PATCH 1/3] fix: import contacts --- backend/src/controllers/ImportPhoneContactsController.js | 2 +- frontend/src/pages/Contacts/index.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backend/src/controllers/ImportPhoneContactsController.js b/backend/src/controllers/ImportPhoneContactsController.js index b24ee0d..1d443ed 100644 --- a/backend/src/controllers/ImportPhoneContactsController.js +++ b/backend/src/controllers/ImportPhoneContactsController.js @@ -15,7 +15,7 @@ exports.store = async (req, res, next) => { } const io = getIO(); - const wbot = getWbot(defaultWhatsapp); + const wbot = getWbot(defaultWhatsapp.id); let phoneContacts; diff --git a/frontend/src/pages/Contacts/index.js b/frontend/src/pages/Contacts/index.js index 5f916a2..226d5b8 100644 --- a/frontend/src/pages/Contacts/index.js +++ b/frontend/src/pages/Contacts/index.js @@ -182,7 +182,9 @@ const Contacts = () => { window.location.reload(false); } catch (err) { console.log(err); - window.location.reload(false); + if (err.response && err.response.data && err.response.data.error) { + toast.error(err.response.data.error); + } } }; @@ -210,8 +212,8 @@ const Contacts = () => { title={ deletingContact ? `${i18n.t("contacts.confirmationModal.deleteTitle")} ${ - deletingContact.name - }?` + deletingContact.name + }?` : `${i18n.t("contacts.confirmationModal.importTitlte")}` } open={confirmOpen} From 247b02b04f27d14e00181257d3ec6d2b141605ea Mon Sep 17 00:00:00 2001 From: "Altair J. Fernandes" Date: Fri, 11 Sep 2020 15:55:34 -0300 Subject: [PATCH 2/3] Create LICENSE (#1) --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d6b90ad --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 canove + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 943888ea5b9133d2e4a5b6780ae67a1f739f514b Mon Sep 17 00:00:00 2001 From: esteves67 <18627611+esteves67@users.noreply.github.com> Date: Tue, 15 Sep 2020 00:26:30 -0300 Subject: [PATCH 3/3] Ignore Empty Messages - Issue #18 Solves #18 --- backend/src/services/wbotMessageListener.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/services/wbotMessageListener.js b/backend/src/services/wbotMessageListener.js index aed420d..85653a6 100644 --- a/backend/src/services/wbotMessageListener.js +++ b/backend/src/services/wbotMessageListener.js @@ -146,6 +146,8 @@ const wbotMessageListener = whatsapp => { msg.from === "status@broadcast" || msg.type === "location" || msg.type === "call_log" || + msg.type === "e2e_notification" || // Ignore Empty Messages Generated When Someone Changes His Account from Personal to Business or vice-versa + msg.type === "notification_template" || // Ignore Empty Messages Generated When Someone Changes His Account from Personal to Business or vice-versa msg.author != null // Ignore Group Messages ) { return;