From bab19a1bbc450d6013b7baefa052186b3ac00da5 Mon Sep 17 00:00:00 2001 From: rawee Date: Sun, 18 Dec 2022 00:01:00 +0530 Subject: [PATCH] Blank number solved --- chats-out.js | 37 +++++++++++++++++++++---------------- group-out.js | 20 ++++++++++++++------ package.json | 2 +- 3 files changed, 36 insertions(+), 23 deletions(-) diff --git a/chats-out.js b/chats-out.js index 10cc36d..479b2a9 100644 --- a/chats-out.js +++ b/chats-out.js @@ -3,32 +3,37 @@ module.exports = function(RED) { RED.nodes.createNode(this,config); var node = this; node.number = config.number; - node.number = node.number.replace(/\D/g, ''); - node.number = `${node.number}@c.us`; var whatsappLinkNode = RED.nodes.getNode(config.whatsappLink); node.waClient = whatsappLinkNode.client; - node.on('input', (message)=> { - try { - node.waClient.sendMessage(node.number, message.payload); - } - catch(e) { - node.log(`Error Sending Msg: ${e}`); - }; - }); - - function SetStatus(WAStatus, color){ node.status({fill:color,shape:"dot",text:WAStatus}); }; + node.on('input', (message)=> { + if (node.number){ + node.number = node.number.replace(/\D/g, ''); + node.number = `${node.number}@c.us`; + try { + node.waClient.sendMessage(node.number, message.payload); + } + catch(e) { + node.log(`Error Sending Msg: ${e}`); + }; + } + else { + SetStatus("No number","red"); + setTimeout(()=>{ + SetStatus('Connected','green'); + }, 5000) + } + + + }); + //whatsapp Status Parameters---- node.waClient.on('qr', (qr) => { SetStatus("QR Code Generated", "yellow"); - // QRCode.toDataURL(qr, function(err, url){ - // msg = {payload : url}; - // node.send(msg); - // }); }); node.waClient.on('auth_failure', () => { diff --git a/group-out.js b/group-out.js index ee588b7..d25bdf6 100644 --- a/group-out.js +++ b/group-out.js @@ -3,17 +3,25 @@ module.exports = function(RED) { RED.nodes.createNode(this,config); var node = this; node.gID = config.gID; - node.gID = node.gID.replace(/\D/g, ''); - node.gID = `${node.gID}@g.us`; var whatsappLinkNode = RED.nodes.getNode(config.whatsappLink); node.waClient = whatsappLinkNode.client; node.on('input', (message)=> { - try { - node.waClient.sendMessage(node.gID, message.payload); + if(node.gID){ + try { + node.gID = node.gID.replace(/\D/g, ''); + node.gID = `${node.gID}@g.us`; + node.waClient.sendMessage(node.gID, message.payload); + } + catch(e) { + node.log(`Error Sending Msg: ${e}`); + }; } - catch(e) { - node.log(`Error Sending Msg: ${e}`); + else { + SetStatus("No Chat-ID","red"); + setTimeout(()=>{ + SetStatus('Connected','green'); + }, 5000) }; }); function SetStatus(WAStatus, color){ diff --git a/package.json b/package.json index 7a6fa9f..cd8b3c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red-contrib-whatsapp-link", - "version": "0.1.24", + "version": "0.1.25", "description": "Whatsapp connection with Node-Red | No third party APIs", "repository": { "type": "git",