fixed #339

windkh · Oct 7, 2023 · a4ab142 · a4ab142
1 parent dc85c7f
commit a4ab142
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+# [15.1.7] - 2023-08-29
+### answerCallbackQuery text is now optional - [#339](https://github.com/windkh/node-red-contrib-telegrambot/issues/339) 
+
 # [15.1.6] - 2023-08-29
 ### stopPoll added - [#331](https://github.com/windkh/node-red-contrib-telegrambot/issues/331) 
 

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

diff --git a/telegrambot/99-telegrambot.js b/telegrambot/99-telegrambot.js
@@ -2486,27 +2486,25 @@ module.exports = function (RED) {
 
                         case 'callback_query':
                         case 'answerCallbackQuery':
-                            if (this.hasContent(msg)) {
-                                let callbackQueryId = msg.payload.callbackQueryId;
-
-                                let options = msg.payload.options;
-                                if (options === undefined) {
-                                    options = {};
-                                }
+                            let callbackQueryId = msg.payload.callbackQueryId;
 
-                                if (options.text === undefined) {
-                                    options.text = msg.payload.content;
-                                }
+                            let options = msg.payload.options;
+                            if (options === undefined) {
+                                options = {};
+                            }
 
-                                telegramBot
-                                    .answerCallbackQuery(callbackQueryId, options)
-                                    .catch(function (ex) {
-                                        node.processError(ex, msg, nodeSend, nodeDone);
-                                    })
-                                    .then(function (result) {
-                                        node.processResult(result, msg, nodeSend, nodeDone);
-                                    });
+                            if (options.text === undefined && msg.payload.content !== undefined) {
+                                options.text = msg.payload.content;
                             }
+
+                            telegramBot
+                                .answerCallbackQuery(callbackQueryId, options)
+                                .catch(function (ex) {
+                                    node.processError(ex, msg, nodeSend, nodeDone);
+                                })
+                                .then(function (result) {
+                                    node.processResult(result, msg, nodeSend, nodeDone);
+                                });
                             break;
 
                         case 'inline_query':