@codebam/cf-workers-telegram-bot 7.7.0 → 7.8.0

package/README.md

@@ -1,16 +1,10 @@
 <h3 align="center">
 <img src="https://raw.githubusercontent.com/codebam/cf-workers-telegram-bot/master/assets/logo.png" width="100" />
 <br/>
-CF workers telegram bot
+CF Workers Telegram Bot
 <br/>
 </h3>
 
-<h6 align="center">
-<a href="https://github.com/codebam/cf-workers-telegram-bot/wiki">Wiki</a>
- · 
-<a  href="https://codebam.github.io/cf-workers-telegram-bot-docs/">Docs</a>
-</h6>
-
 <p  align="center">
 <a href="https://github.com/codebam/cf-workers-telegram-bot/stargazers">  <img src="https://img.shields.io/github/stars/codebam/cf-workers-telegram-bot?style=for-the-badge&logo=starship&color=111111&logoColor=ffffff&labelColor=000000" alt="GitHub stars"/></a>
 <a href="https://github.com/codebam/cf-workers-telegram-bot/issues">
@@ -19,7 +13,7 @@ CF workers telegram bot
 <a href="https://www.npmjs.com/package/@codebam/cf-workers-telegram-bot">  <img src="https://img.shields.io/npm/v/@codebam/cf-workers-telegram-bot?style=for-the-badge&logo=npm&color=111111&logoColor=ffffff&labelColor=000000" alt="npm version" /></a>
 </p>
 
-![screenshot of cf-workers-telegram-bot](/screenshot.png)
+![screenshot of cf-workers-telegram-bot](https://raw.githubusercontent.com/codebam/cf-workers-telegram-bot/master/assets/screenshot.png)
 
 ```sh
 npm i @codebam/cf-workers-telegram-bot

package/dist/api.d.ts

@@ -1,14 +1,29 @@
 /// <reference types="@cloudflare/workers-types" />
-import { SerializableData, TelegramInlineQueryResultArticle } from "./types";
+import { SerializableData, TelegramInlineQueryResultArticle, TelegramInlineQueryResultPhoto } from './types';
+import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo';
 export default class API {
-    static getApiUrl(botApi: string, slug: string, data: Record<string, SerializableData>): string;
+    static getApiUrl(botApi: string, slug: string, data: Record<string, SerializableData>): Request<unknown, CfProperties<unknown>>;
+    static getFile(botApi: string, data: {
+        file_id: string;
+    }, token: string): Promise<ArrayBuffer>;
     static sendMessage(botApi: string, data: {
         reply_to_message_id: number | string;
         chat_id: number | string;
         text: string;
     }): Promise<Response>;
+    static sendVideo(botApi: string, data: {
+        reply_to_message_id: number | string;
+        chat_id: number | string;
+        video: string;
+    }): Promise<Response>;
+    static sendPhoto(botApi: string, data: {
+        reply_to_message_id: number | string;
+        chat_id: number | string;
+        photo: string;
+        caption: string;
+    }): Promise<Response>;
     static answerInline(botApi: string, data: {
         inline_query_id: number | string;
-        results: TelegramInlineQueryResultArticle[];
+        results: TelegramInlineQueryResultArticle[] | TelegramInlineQueryResultPhoto[] | TelegramInlineQueryResultVideo[];
     }): Promise<Response>;
 }

package/dist/api.js

@@ -5,16 +5,32 @@ export default class API {
         for (const i in data) {
             params.append(i, data[i].toString());
         }
-        return `${request}?${params}`;
+        return new Request(`${request}?${params}`);
+    }
+    static async getFile(botApi, data, token) {
+        const url = this.getApiUrl(botApi, 'getFile', data);
+        const response = await fetch(url);
+        const json = (await response.json());
+        const file_path = json.result.file_path;
+        const file_response = await fetch(`https://api.telegram.org/file/bot${token}/${file_path}`);
+        return await file_response.arrayBuffer();
     }
     static async sendMessage(botApi, data) {
         const url = this.getApiUrl(botApi, 'sendMessage', data);
         return await fetch(url);
     }
+    static async sendVideo(botApi, data) {
+        const url = this.getApiUrl(botApi, 'sendVideo', data);
+        return await fetch(url);
+    }
+    static async sendPhoto(botApi, data) {
+        const url = this.getApiUrl(botApi, 'sendPhoto', data);
+        return await fetch(url);
+    }
     static async answerInline(botApi, data) {
         const url = this.getApiUrl(botApi, 'answerInlineQuery', {
             inline_query_id: data.inline_query_id,
-            results: JSON.stringify(data.results)
+            results: JSON.stringify(data.results),
         });
         return await fetch(url);
     }

package/dist/ctx.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="@cloudflare/workers-types" />
-import TelegramBot from "./telegram_bot";
-import { SerializableData, TelegramUpdate } from "./types";
-export default class ExecutionContext {
+import TelegramBot from './telegram_bot';
+import { SerializableData, TelegramUpdate } from './types';
+export default class TelegramExecutionContext {
     bot: TelegramBot;
     update: TelegramUpdate;
     update_type: string;
@@ -12,5 +12,8 @@ export default class ExecutionContext {
     setData(key: string, value: SerializableData): this;
     deleteData(key: string): this;
     getData(key: string): SerializableData;
-    reply(message: string): Promise<void>;
+    replyVideo(video: string): Promise<Response | undefined>;
+    getFile(file_id: string): Promise<ArrayBuffer>;
+    replyPhoto(photo: string, caption?: string): Promise<Response | undefined>;
+    reply(message: string): Promise<Response | undefined>;
 }

package/dist/ctx.js

@@ -1,6 +1,7 @@
-import API from "./api";
-import { TelegramInlineQueryResultArticle } from "./types";
-export default class ExecutionContext {
+import API from './api';
+import { TelegramInlineQueryResultArticle, TelegramInlineQueryResultPhoto } from './types';
+import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo';
+export default class TelegramExecutionContext {
     bot;
     update;
     update_type = '';
@@ -8,7 +9,10 @@ export default class ExecutionContext {
     constructor(bot, update) {
         this.bot = bot;
         this.update = update;
-        if (this.update.message?.text) {
+        if (this.update.message?.photo) {
+            this.update_type = 'photo';
+        }
+        else if (this.update.message?.text) {
             this.update_type = 'message';
         }
         else if (this.update.inline_query?.query) {
@@ -16,7 +20,7 @@ export default class ExecutionContext {
         }
     }
     getText() {
-        return this.update.message?.text || this.update.inline_query?.query || "";
+        return this.update.message?.text || this.update.inline_query?.query || '';
     }
     next() {
         return new Response('ok');
@@ -32,23 +36,70 @@ export default class ExecutionContext {
     getData(key) {
         return this.data[key];
     }
-    async reply(message) {
+    async replyVideo(video) {
         switch (this.update_type) {
-            case 'message': {
-                await API.sendMessage(this.bot.api.toString(), {
+            case 'message':
+                return await API.sendVideo(this.bot.api.toString(), {
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
-                    text: message
+                    video,
+                });
+            case 'inline':
+                return await API.answerInline(this.bot.api.toString(), {
+                    inline_query_id: this.update.inline_query?.id.toString() ?? '',
+                    results: [new TelegramInlineQueryResultVideo(video)],
                 });
+            default:
                 break;
-            }
-            case 'inline': {
-                await API.answerInline(this.bot.api.toString(), {
+        }
+    }
+    async getFile(file_id) {
+        return await API.getFile(this.bot.api.toString(), { file_id }, this.bot.token);
+    }
+    async replyPhoto(photo, caption = '') {
+        switch (this.update_type) {
+            case 'photo':
+                return await API.sendPhoto(this.bot.api.toString(), {
+                    chat_id: this.update.message?.chat.id.toString() ?? '',
+                    reply_to_message_id: this.update.message?.message_id.toString() ?? '',
+                    photo,
+                    caption,
+                });
+            case 'message':
+                return await API.sendPhoto(this.bot.api.toString(), {
+                    chat_id: this.update.message?.chat.id.toString() ?? '',
+                    reply_to_message_id: this.update.message?.message_id.toString() ?? '',
+                    photo,
+                    caption,
+                });
+            case 'inline':
+                return await API.answerInline(this.bot.api.toString(), {
                     inline_query_id: this.update.inline_query?.id.toString() ?? '',
-                    results: [new TelegramInlineQueryResultArticle(message)]
+                    results: [new TelegramInlineQueryResultPhoto(photo)],
                 });
+            default:
                 break;
-            }
+        }
+    }
+    async reply(message) {
+        switch (this.update_type) {
+            case 'message':
+                return await API.sendMessage(this.bot.api.toString(), {
+                    chat_id: this.update.message?.chat.id.toString() ?? '',
+                    reply_to_message_id: this.update.message?.message_id.toString() ?? '',
+                    text: message,
+                });
+            case 'photo':
+                return await API.sendMessage(this.bot.api.toString(), {
+                    chat_id: this.update.message?.chat.id.toString() ?? '',
+                    reply_to_message_id: this.update.message?.message_id.toString() ?? '',
+                    text: message,
+                });
+            case 'inline':
+                return await API.answerInline(this.bot.api.toString(), {
+                    inline_query_id: this.update.inline_query?.id.toString() ?? '',
+                    results: [new TelegramInlineQueryResultArticle(message)],
+                });
             default:
                 break;
         }

package/dist/telegram_bot.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="@cloudflare/workers-types" />
 import { TelegramUpdate } from './types';
-import ExecutionContext from './ctx';
+import TelegramExecutionContext from './ctx';
 import Webhook from './webhook';
 export default class TelegramBot {
     token: string;
@@ -8,9 +8,9 @@ export default class TelegramBot {
     api: URL;
     update: TelegramUpdate;
     update_type: string;
-    commands: Record<string, (ctx: ExecutionContext) => Promise<Response>>;
-    currentContext: ExecutionContext;
+    commands: Record<string, (ctx: TelegramExecutionContext) => Promise<Response>>;
+    currentContext: TelegramExecutionContext;
     constructor(token: string);
-    on(event: string, callback: (ctx: ExecutionContext) => Promise<Response>): this;
+    on(event: string, callback: (ctx: TelegramExecutionContext) => Promise<Response>): this;
     handle(request: Request): Promise<Response>;
 }

package/dist/telegram_bot.js

@@ -1,5 +1,5 @@
 import { TelegramUpdate } from './types';
-import ExecutionContext from './ctx';
+import TelegramExecutionContext from './ctx';
 import Webhook from './webhook';
 export default class TelegramBot {
     token;
@@ -18,8 +18,6 @@ export default class TelegramBot {
     }
     on(event, callback) {
         if (event !== 'on') {
-            // eslint-disable-next-line
-            // @ts-ignore TS7053
             this.commands[event] = callback;
         }
         return this;
@@ -43,25 +41,26 @@ export default class TelegramBot {
             console.log(this.update);
             let command = 'default';
             let args = [];
-            const ctx = new ExecutionContext(this, this.update);
+            const ctx = new TelegramExecutionContext(this, this.update);
             this.currentContext = ctx;
             switch (ctx.update_type) {
                 case 'message': {
-                    // @ts-expect-error already checked above
-                    args = this.update.message.text.split(' ');
+                    args = this.update.message?.text?.split(' ') ?? [];
                     break;
                 }
                 case 'inline': {
-                    // @ts-expect-error already checked above
-                    args = this.update.inline_query.query.split(' ');
+                    args = this.update.inline_query?.query.split(' ') ?? [];
+                    break;
+                }
+                case 'photo': {
+                    command = ':photo';
                     break;
                 }
                 default:
                     break;
             }
             if (args.at(0)?.startsWith('/')) {
-                // @ts-expect-error already checked above
-                command = args.at(0).slice(1);
+                command = args.at(0)?.slice(1) ?? 'default';
             }
             this.commands['any']?.(ctx);
             if (!this.commands[command]) {

package/dist/types/TelegramInlineQueryResultPhoto.d.ts

@@ -1,4 +1,5 @@
 import TelegramInlineQueryResult from './TelegramInlineQueryResult';
+import TelegramInputMessageContent from './TelegramInputMessageContent';
 export default class TelegramInlineQueryResultPhoto extends TelegramInlineQueryResult {
     photo_url: string;
     thumb_url: string;
@@ -9,5 +10,6 @@ export default class TelegramInlineQueryResultPhoto extends TelegramInlineQueryR
     caption?: string;
     parse_mode?: string;
     caption_entities?: string;
+    input_message_content?: TelegramInputMessageContent;
     constructor(photo: string);
 }

package/dist/types/TelegramInlineQueryResultPhoto.js

@@ -10,7 +10,7 @@ export default class TelegramInlineQueryResultPhoto extends TelegramInlineQueryR
     parse_mode;
     caption_entities;
     // reply_markup?: TelegramInlineKeyboardMarkup;
-    // input_message_content?: TelegramInputMessageContent;
+    input_message_content;
     constructor(photo) {
         super('photo');
         this.photo_url = photo;

package/dist/types/TelegramInlineQueryResultVideo.d.ts

@@ -0,0 +1,15 @@
+import TelegramInlineQueryResult from './TelegramInlineQueryResult';
+import TelegramInputMessageContent from './TelegramInputMessageContent';
+export default class TelegramInlineQueryResultVideo extends TelegramInlineQueryResult {
+    video_url: string;
+    thumb_url: string;
+    photo_width?: number;
+    photo_height?: number;
+    title?: string;
+    description?: string;
+    caption?: string;
+    parse_mode?: string;
+    caption_entities?: string;
+    input_message_content?: TelegramInputMessageContent;
+    constructor(video: string);
+}

package/dist/types/TelegramInlineQueryResultVideo.js

@@ -0,0 +1,19 @@
+import TelegramInlineQueryResult from './TelegramInlineQueryResult';
+export default class TelegramInlineQueryResultVideo extends TelegramInlineQueryResult {
+    video_url;
+    thumb_url;
+    photo_width;
+    photo_height;
+    title;
+    description;
+    caption;
+    parse_mode;
+    caption_entities;
+    // reply_markup?: TelegramInlineKeyboardMarkup;
+    input_message_content;
+    constructor(video) {
+        super('video');
+        this.video_url = video;
+        this.thumb_url = video;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "7.7.0",
+	"version": "7.8.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main/src/main.js",
 	"module": "./dist/main/src/main.js",
@@ -43,5 +43,5 @@
 		"typescript-eslint": "^7.8.0",
 		"vitest": "^1.6.0"
 	},
-	"gitHead": "11d5f60c49614aaeaa1e980790be6c2c3ef2057a"
+	"gitHead": "f70461a7e08ddedf437e1ee761c0c40c6184f3f2"
 }