@codebam/cf-workers-telegram-bot 11.5.2 → 11.6.0

package/README.md

@@ -95,9 +95,9 @@ The `consumer` directory in this repository serves as a template for new project
    npm run deploy
    ```
 
-6. **Set Webhook**:
+5. **Set Webhook**:
    Visit the following URL in your browser to register your worker with Telegram:
-   `https://<your-worker>.<your-subdomain>.workers.dev/<SECRET_TELEGRAM_API_TOKEN>?command=set`
+   `https://<your-worker>.<your-subdomain>.workers.dev/<SECRET_TELEGRAM_API_TOKEN>/setWebhook`
 
 ## Deployment
 
@@ -108,7 +108,8 @@ npx wrangler deploy
 ```
 
 ### GitHub Actions
-To automate deployments, use the [Wrangler Action](https://github.com/cloudflare/wrangler-action). Add `CLOUDFLARE_API_TOKEN` and `SECRET_TELEGRAM_API_TOKEN` to your repository secrets.
+To automate deployments, use the [Wrangler Action](https://github.com/cloudflare/wrangler-action) or Cloudflare's built-in [GitHub integration](https://developers.cloudflare.com/workers/ci-cd/github-actions/).
+
 
 ## API Documentation
 Detailed API documentation is available at [cf-workers-telegram-bot.codebam.ca](https://cf-workers-telegram-bot.codebam.ca).

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.2",
+	"version": "11.6.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",