@codebam/cf-workers-telegram-bot 11.5.3 → 11.6.1

package/dist/telegram_api.js

@@ -27,7 +27,16 @@ export default class TelegramApi {
     async fetchAndLog(url, slug, data) {
         const response = await fetch(url);
         if (response.status !== 200) {
-            throw new Error(`Telegram API error: ${String(response.status)} ${response.statusText}`);
+            const cloned = response.clone();
+            let errorDescription = '';
+            try {
+                const json = (await cloned.json());
+                errorDescription = json.description ? `: ${json.description}` : '';
+            }
+            catch {
+                // ignore
+            }
+            throw new Error(`Telegram API error: ${String(response.status)} ${response.statusText}${errorDescription}`);
         }
         const cloned = response.clone();
         try {

package/dist/telegram_bot.js

@@ -114,16 +114,23 @@ export default class TelegramBot {
             case 'inline':
                 return ':inline' in this.commands ? ':inline' : this.defaultCommand;
             case 'guest_message':
-                return ':guest_message' in this.commands ? ':guest_message' : this.defaultCommand;
+                // For guest messages, we fall through to command detection if it's not a special type
+                break;
             case 'pre_checkout_query':
                 return ':pre_checkout_query' in this.commands ? ':pre_checkout_query' : this.defaultCommand;
             case 'successful_payment':
                 return ':successful_payment' in this.commands ? ':successful_payment' : this.defaultCommand;
         }
-        // Then check if it's a command starting with /
-        if (args[0]?.startsWith('/')) {
-            const command = args[0].substring(1, args[0].lastIndexOf('@') > -1 ? args[0].lastIndexOf('@') : args[0].length);
-            return command in this.commands ? command : this.defaultCommand;
+        // Then check if there's a command starting with / anywhere in the message
+        const commandIndex = args.findIndex((arg) => arg.startsWith('/'));
+        if (commandIndex !== -1) {
+            const fullCommand = args[commandIndex];
+            const command = fullCommand.substring(1, fullCommand.lastIndexOf('@') > -1 ? fullCommand.lastIndexOf('@') : fullCommand.length);
+            if (command in this.commands) {
+                // Shift args so the command handler sees the command at index 0
+                ctx.args = args.slice(commandIndex);
+                return command;
+            }
         }
         return this.defaultCommand;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "11.5.3",
+	"version": "11.6.1",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",