Modified chatId handling in event nodes.

inline_query does not require a chatId and will not be blocked by the sender node any longer. The sender node created an error when the chatId was not present blocking all other types that do not make use of the chatid.
windkh · May 2, 2021 · e349958 · e349958
1 parent 7519e72
commit e349958
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [9.3.0] - 2021-05-02
+### fixed chat id exceptions in event nodes.
+- fixed - [#175](https://github.com/windkh/node-red-contrib-telegrambot/issues/175)
+
 # [9.2.1] - 2021-04-07
 ### exception in event node.
 - fixed - [#168](https://github.com/windkh/node-red-contrib-telegrambot/issues/168)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-contrib-telegrambot",
-    "version": "9.2.1",
+    "version": "9.3.0",
     "description": "Telegram bot nodes for Node-RED",
     "dependencies": {
         "bluebird": "^3.5.1",

diff --git a/telegrambot/99-telegrambot.js b/telegrambot/99-telegrambot.js
@@ -1155,15 +1155,30 @@ module.exports = function (RED) {
                             userid = botMsg.from.id;
                         }
                     } else if (botMsg.from) {
-                        //private, group, supergroup
-                        chatid = botMsg.message.chat.id;
+                        //sender, group, supergroup
+
+                        switch (botMsg.chat_type) {
+                            case 'sender':
+                                if (botMsg.message !== undefined) {
+                                    chatid = botMsg.message.chat.id;
+                                }
+                                break;
+                            case 'group':
+                            case 'supergroup':
+                            case 'channel':
+                                if (botMsg.message !== undefined) {
+                                    chatid = botMsg.message.chat.id;
+                                }
+                                break;
+                            default:
+                                ;
+                                break;
+                        }
+
                         username = botMsg.from.username;
                         userid = botMsg.from.id;
                     } else {
-                        // polls can be anonymous, then we do not have a chatId.
-                        if (this.event != 'poll') {
-                            node.error('username or chatid undefined');
-                        }
+                        // chatid can be null in case of polls, inline_queries,...
                     }
 
                     if (node.config.isAuthorized(node, chatid, userid, username)) {
@@ -2054,22 +2069,18 @@ module.exports = function (RED) {
             node.status({ fill: 'green', shape: 'ring', text: 'connected' });
 
             if (msg.payload) {
-                if (msg.payload.chatId) {
-                    if (!Array.isArray(msg.payload.chatId)) {
-                        this.processMessage(msg.payload.chatId, msg, nodeSend, nodeDone);
-                    } else {
-                        let chatIds = msg.payload.chatId;
-                        let length = chatIds.length;
-                        for (let i = 0; i < length; i++) {
-                            let chatId = chatIds[i];
-
-                            let clonedMsg = RED.util.cloneMessage(msg);
-                            clonedMsg.payload.chatId = chatId;
-                            this.processMessage(chatId, clonedMsg, nodeSend, nodeDone);
-                        }
-                    }
+                if (!Array.isArray(msg.payload.chatId)) {
+                    this.processMessage(msg.payload.chatId, msg, nodeSend, nodeDone);
                 } else {
-                    node.warn('msg.payload.chatId is empty');
+                    let chatIds = msg.payload.chatId;
+                    let length = chatIds.length;
+                    for (let i = 0; i < length; i++) {
+                        let chatId = chatIds[i];
+
+                        let clonedMsg = RED.util.cloneMessage(msg);
+                        clonedMsg.payload.chatId = chatId;
+                        this.processMessage(chatId, clonedMsg, nodeSend, nodeDone);
+                    }
                 }
             } else {
                 node.warn('msg.payload is empty');