@codebam/cf-workers-telegram-bot 3.47.0 → 4.0.0

package/dist/main/src/telegram_api.js

@@ -4,10 +4,10 @@ export default class TelegramApi extends BotApi {
     constructor(commands, webhook, handler) {
         super(commands, webhook, handler);
     }
-    inlineQueryUpdate = async (update) => this.executeInlineCommand(update).then(async (response) => (await responseToJSON(response)) && response);
+    inlineQueryUpdate = async (update) => this.executeInlineCommand(update).then(async (response) => responseToJSON(response).then(() => response));
     messageUpdate = async (update) => {
         if (typeof (update.message?.text ?? false) === "string") {
-            return await this.executeCommand(update).then(async () => await this.greetUsers(update));
+            return this.executeCommand(update).then(async () => this.greetUsers(update));
         }
         return this.updates.default;
     };
@@ -16,20 +16,18 @@ export default class TelegramApi extends BotApi {
         message: this.messageUpdate,
         default: new Response(),
     };
-    update = async (update) => (log({ update }) &&
-        update.message !== undefined &&
-        (await this.updates.message(update))) ||
-        (update.inline_query !== undefined &&
-            update.inline_query.query !== "" &&
-            (await this.updates.inline_query(update))) ||
+    update = async (update) => ((log({ update }) &&
+        update.message &&
+        this.updates.message(update)) ||
+        (update.inline_query &&
+            update.inline_query.query === "" &&
+            undefined) ||
+        this.updates.inline_query(update)) ??
         this.updates.default;
     // greet new users who join
-    greetUsers = async (update) => {
-        if (update.message?.new_chat_members !== undefined) {
-            return this.sendMessage(update.message.chat.id, `Welcome to ${update.message.chat.title}, ${update.message.from.username}`);
-        }
-        return this.updates.default;
-    };
+    greetUsers = async (update) => (update.message?.new_chat_members &&
+        this.sendMessage(update.message.chat.id, `Welcome to ${update.message.chat.title}, ${update.message.from.username}`)) ??
+        this.updates.default;
     getCommand = (args) => args[0]?.split("@")[0];
     // run command passed from executeCommand
     _executeCommand = async (update, text, args = []) => (log({ execute: { text, args } }) &&
@@ -47,11 +45,10 @@ export default class TelegramApi extends BotApi {
             .split(" "))) ??
         this.updates.default;
     // execute the inline custom bot commands from bot configurations
-    executeInlineCommand = async (update) => ((await this._executeCommand(update, update.inline_query?.query ?? "")) &&
-        (await this._executeCommand(update, "inline", update.inline_query?.query.trimStart().split(" ")))) ??
-        this.updates.default;
+    executeInlineCommand = async (update) => this._executeCommand(update, update.inline_query?.query ?? "").then(async (command_response) => command_response &&
+        this._executeCommand(update, "inline", update.inline_query?.query.trimStart().split(" ")).then((_command_response) => _command_response)) ?? this.updates.default;
     // execute the custom bot commands from bot configurations
-    executeCommand = async (update) => this._executeCommand(update, update.message?.text ?? "") ||
+    executeCommand = async (update) => this._executeCommand(update, update.message?.text ?? "") ??
         this.updates.default;
     // trigger answerInlineQuery command of BotAPI
     answerInlineQuery = async (inline_query_id, results, cache_time = 0) => fetch(log(addSearchParams(new URL(`${this.webhook.api.origin}${this.webhook.api.pathname}/answerInlineQuery`), {

package/dist/main/src/telegram_bot.js

@@ -57,7 +57,7 @@ export default class TelegramBot extends TelegramApi {
     // bot command: /kanye
     kanye = async (update) => fetch("https://api.kanye.rest")
         .then((response) => responseToJSON(response))
-        .then((json) => ((message) => (update.inline_query !== undefined &&
+        .then((json) => ((message) => (update.inline_query &&
         this.answerInlineQuery(update.inline_query.id, [
             new TelegramInlineQueryResultArticle(message),
         ])) ||

package/dist/worker/src/worker.d.ts

@@ -7,6 +7,6 @@ interface Environment {
     SECRET_TELEGRAM_API_TOKEN3: string;
 }
 declare const _default: {
-    fetch: (request: Request, env: Environment) => Promise<Response>;
+    fetch: (request: Request, env: Environment) => Promise<any>;
 };
 export default _default;

package/dist/worker/src/worker.js

@@ -1,4 +1,4 @@
-import { TelegramCommands, Handler, TelegramWebhook, TelegramBot, } from "../../main/src/main";
+import { TelegramCommands, Handler, TelegramWebhook, TelegramBot, Libs, } from "../../main/src/main";
 export default {
     fetch: async (request, env) => new Handler([
         {
@@ -49,5 +49,7 @@ export default {
                 "/start": TelegramCommands.commandList,
             },
         },
-    ]).handle(request),
+    ])
+        .handle(request)
+        .then(Libs.log),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "3.47.0",
+	"version": "4.0.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main/src/main.js",
 	"module": "./dist/main/src/main.js",
@@ -29,15 +29,15 @@
 		"url": "https://github.com/codebam/cf-workers-telegram-bot.git"
 	},
 	"dependencies": {
-		"worker": "^3.44.0"
+		"worker": "^4.0.0"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230215.0",
-		"@typescript-eslint/eslint-plugin": "^5.52.0",
-		"@typescript-eslint/parser": "^5.52.0",
+		"@cloudflare/workers-types": "^4.20230221.0",
+		"@typescript-eslint/eslint-plugin": "^5.53.0",
+		"@typescript-eslint/parser": "^5.53.0",
 		"eslint": "^8.34.0",
 		"prettier": "^2.8.4",
 		"typescript": "^4.9.5"
 	},
-	"gitHead": "05279fb873fc0f45050e2d0490e46b9c44a0eb2e"
+	"gitHead": "957149aedeb10d1fbc6e926f3d19ba5b4f211ad8"
 }