fixed #168

windkh · Apr 7, 2021 · 7519e72 · 7519e72
1 parent aba65e4
commit 7519e72
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-# [9.1.1] - 2021-04-07
+# [9.2.1] - 2021-04-07
+### exception in event node.
+- fixed - [#168](https://github.com/windkh/node-red-contrib-telegrambot/issues/168)
+
+# [9.1.2] - 2021-04-07
 ### refactored status events
 
 # [9.0.0] - 2021-04-03

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

diff --git a/telegrambot/99-telegrambot.js b/telegrambot/99-telegrambot.js
@@ -429,9 +429,20 @@ module.exports = function (RED) {
             if (self.config.chatids === '' && self.config.usernames === '') {
                 isAuthorized = true;
             } else {
-                let isAuthorizedUser = self.isAuthorizedUser(node, user);
-                let isAuthorizedChatId = self.isAuthorizedChat(node, chatid);
-                let isAuthorizedUserId = self.isAuthorizedChat(node, userid);
+                let isAuthorizedUser = false;
+                if (user !== undefined) {
+                    isAuthorizedUser = self.isAuthorizedUser(node, user);
+                }
+
+                let isAuthorizedChatId = false;
+                if (chatid !== undefined) {
+                    isAuthorizedChatId = self.isAuthorizedChat(node, chatid);
+                }
+
+                let isAuthorizedUserId = false;
+                if (userid !== undefined) {
+                    isAuthorizedUserId = self.isAuthorizedChat(node, userid);
+                }
 
                 if (isAuthorizedUser || isAuthorizedChatId || isAuthorizedUserId) {
                     isAuthorized = true;
@@ -1140,7 +1151,9 @@ module.exports = function (RED) {
                         //channel
                         username = botMsg.chat.username;
                         chatid = botMsg.chat.id;
-                        userid = botMsg.from.id;
+                        if (botMsg.from !== undefined) {
+                            userid = botMsg.from.id;
+                        }
                     } else if (botMsg.from) {
                         //private, group, supergroup
                         chatid = botMsg.message.chat.id;