@codebam/cf-workers-telegram-bot 6.4.0 → 6.6.0

package/dist/main/src/commands/bored.js

@@ -1,7 +1,6 @@
-import { responseToJSON } from '../libs';
 import { TelegramInlineQueryResultArticle } from '../types';
 export default async (self, update) => fetch('https://boredapi.com/api/activity/')
-    .then((response) => responseToJSON(response))
+    .then((response) => response.json())
     .then((json) => json)
     .then((bored_response) => update.inline_query
     ? self.answerInlineQuery(update.inline_query.id, [new TelegramInlineQueryResultArticle(bored_response.activity)], 0)

package/dist/main/src/commands/getchatinfo.js

@@ -1,2 +1 @@
-import { preTagString, prettyJSON } from '../libs';
-export default async (self, update) => self.sendMessage(update.message?.chat.id ?? 0, preTagString(prettyJSON(update.message?.chat ?? 0)), 'HTML');
+export default async (self, update) => self.sendMessage(update.message?.chat.id ?? 0, `<pre>${JSON.stringify(update.message?.chat ?? 0)}</pre>`, 'HTML');

package/dist/main/src/commands/joke.js

@@ -1,7 +1,6 @@
-import { responseToJSON } from '../libs';
 import { TelegramInlineQueryResultArticle } from '../types';
 export default async (self, update) => fetch('https://v2.jokeapi.dev/joke/Any?safe-mode')
-    .then((response) => responseToJSON(response))
+    .then((response) => response.json())
     .then((joke) => joke)
     .then((joke_response) => ((message) => update.inline_query
     ? self.answerInlineQuery(update.inline_query.id, [new TelegramInlineQueryResultArticle(message, joke_response.joke ?? joke_response.setup, 'HTML')], 0)

package/dist/main/src/commands/kanye.js

@@ -1,7 +1,7 @@
-import { responseToJSON } from '../libs';
 import { TelegramInlineQueryResultArticle } from '../types';
 export default async (self, update) => fetch('https://api.kanye.rest')
-    .then((response) => responseToJSON(response))
+    .then((response) => response.json())
+    .then((json) => json)
     .then((json) => ((message) => update.inline_query
     ? self.answerInlineQuery(update.inline_query.id, [new TelegramInlineQueryResultArticle(message)])
     : self.sendMessage(update.message?.chat.id ?? 0, message))(`Kanye says... ${json.quote}`))

package/dist/main/src/commands/question.js

@@ -50,7 +50,7 @@ export default async (self, update, args) => {
         // @ts-expect-error chat model might not match
         .run(self.chat_model, {
         prompt,
-        max_tokens: 596,
+        max_tokens: update.inline_query ? 50 : 596,
     })
         /* eslint-disable  @typescript-eslint/no-explicit-any */
         .then(({ response }) => response.replace(/(\[|)(\/|)INST(S|)(s|)(\]|)/, '').replace(/<<(\/|)SYS>>/, ''));

package/dist/main/src/commands/translate.js

@@ -13,14 +13,14 @@ export default async (self, update, args) => {
     if (_prompt === '') {
         _prompt = '';
     }
-    const langs = ['french', 'arabic', 'german', 'spanish', 'russian'];
+    const langs = ['french'];
     const inline_articles = await Promise.all(langs.map(async (lang) => {
         const response = await self.ai.run('@cf/meta/m2m100-1.2b', {
             text: _prompt,
             source_lang: lang,
             target_lang: 'english',
         });
-        return new TelegramInlineQueryResultArticle(response.translated_text, `${lang}: ${response.translated_text}`);
+        return new TelegramInlineQueryResultArticle(response.translated_text, response.translated_text);
     }));
     return self.answerInlineQuery(update.inline_query?.id ?? 0, inline_articles);
 };

package/dist/main/src/libs.d.ts

@@ -1,10 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
 export declare const sha256: (text: string) => Promise<string>;
-export declare const prettyJSON: (obj: unknown) => string;
-export declare const JSONResponse: (obj: unknown, status?: number) => Response;
 export declare const log: (obj: any) => any;
-export declare const preTagString: (str: string) => string;
 export declare const addSearchParams: (url: URL, params?: Record<string, string>) => URL;
-export declare const responseToJSON: (response: Response) => Promise<Record<string, unknown>>;
 export declare const undefinedEmpty: <T>(obj: T) => (T & ({} | null))[];
-export declare const fetch_json: (url: URL) => Promise<Response>;

package/dist/main/src/libs.js

@@ -1,25 +1,7 @@
 export const sha256 = async (text) => crypto.subtle.digest('SHA-256', new TextEncoder().encode(text)).then((array_buffer) => Array.from(new Uint8Array(array_buffer))
     .map((b) => b.toString(16).padStart(2, '0'))
     .join(''));
-// format json with line indents and newlines
-export const prettyJSON = (obj) => JSON.stringify(obj, null, 2);
-// Generate JSON response
-export const JSONResponse = (obj, status = 200) => new Response(prettyJSON(obj), {
-    status: status,
-    headers: {
-        'content-type': 'application/json',
-    },
-});
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const log = (obj) => console.log(obj) === undefined && obj;
-export const preTagString = (str) => `<pre>${str}</pre>`;
 export const addSearchParams = (url, params = {}) => new URL(`${url.origin}${url.pathname}?${new URLSearchParams(Object.entries(Object.fromEntries([...Array.from(url.searchParams.entries()), ...Object.entries(params)]))).toString()}`);
-export const responseToJSON = async (response) => response
-    .clone()
-    .text()
-    .then((text) => JSON.parse(text))
-    .catch(() => log({ error: 'Failed to parse JSON of response' }));
 export const undefinedEmpty = (obj) => (obj === undefined ? [] : [obj]);
-export const fetch_json = async (url) => fetch(url.href)
-    .then((response) => responseToJSON(response))
-    .then((json) => JSONResponse(json));

package/dist/main/src/telegram_api.js

@@ -5,7 +5,13 @@ export default class TelegramApi extends BotApi {
         super({ commands, webhook, handler });
     }
     inlineQueryUpdate = async (update) => this.executeInlineCommand(update);
-    messageUpdate = async (update) => typeof update.message?.text === 'string' ? this.executeCommand(update).then(async () => this.greetUsers(update)) : this.updates.default;
+    messageUpdate = async (update) => {
+        if (update.message) {
+            await this.greetUsers(update);
+            await this.executeCommand(update);
+        }
+        return this.updates.default;
+    };
     updates = {
         inline_query: this.inlineQueryUpdate,
         message: this.messageUpdate,
@@ -29,7 +35,7 @@ export default class TelegramApi extends BotApi {
     };
     // greet new users who join
     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.sendMessage(update.message.chat.id, `Welcome to ${update.message.chat.title}, @${update.message.new_chat_member?.username}`)
         : this.updates.default;
     getCommand = (args) => args[0]?.split('@')[0];
     // run command passed from executeCommand

package/dist/main/src/telegram_webhook.js

@@ -1,17 +1,17 @@
 import Webhook from './webhook';
-import { sha256, addSearchParams, fetch_json } from './libs';
+import { sha256, addSearchParams } from './libs';
 export default class TelegramWebhook extends Webhook {
     constructor(api, token, url) {
         super(api, token, url);
     }
-    set = async (drop_pending_updates = true) => sha256(this.token).then((access_key) => fetch_json(addSearchParams(new URL(`${this.api.origin}${this.api.pathname}/setWebhook`), {
+    set = async (drop_pending_updates = true) => sha256(this.token).then((access_key) => fetch(addSearchParams(new URL(`${this.api.origin}${this.api.pathname}/setWebhook`), {
         url: new URL(`${this.url.origin}${this.url.pathname}${access_key}`).href,
         max_connections: '100',
         allowed_updates: JSON.stringify(['message', 'inline_query']),
         drop_pending_updates: drop_pending_updates.toString(),
     })));
-    get = async () => fetch_json(new URL(`${this.api.origin}${this.api.pathname}/getWebhookInfo`));
-    delete = async () => fetch_json(new URL(`${this.api.origin}${this.api.pathname}/deleteWebhook`));
+    get = async () => fetch(new URL(`${this.api.origin}${this.api.pathname}/getWebhookInfo`));
+    delete = async () => fetch(new URL(`${this.api.origin}${this.api.pathname}/deleteWebhook`));
     commands = {
         set: this.set,
         get: this.get,

package/dist/main/src/types/Kanye.d.ts

@@ -0,0 +1,4 @@
+type Kanye = {
+    quote: string;
+};
+export default Kanye;

package/dist/main/src/types/Kanye.js

@@ -0,0 +1 @@
+export {};

package/dist/main/src/types/TelegramMessage.d.ts

@@ -28,6 +28,7 @@ type TelegramMessage = {
     caption?: string;
     caption_entities?: TelegramMessageEntity[];
     new_chat_members?: TelegramUser[];
+    new_chat_member?: TelegramUser;
     left_chat_member?: TelegramUser;
     new_chat_title?: string;
     delete_chat_photo?: boolean;

package/dist/main/src/types.d.ts

@@ -26,4 +26,5 @@ import TelegramInlineQueryResultPhoto from './types/TelegramInlineQueryResultPho
 import TelegramInlineQueryResultArticle from './types/TelegramInlineQueryResultArticle';
 import DDGQueryResponse from './types/DDGQueryResponse';
 import ChatPermissions from './types/ChatPermissions';
-export { Webhook, Command, TelegramCommand, Commands, Kv, Config, localhost, WebhookCommands, Joke, Bored, Balance, TelegramFrom, TelegramChat, TelegramUser, TelegramMessageEntity, TelegramPhotoSize, TelegramMessage, TelegramInputMessageContent, TelegramInlineQuery, Update, TelegramUpdate, PartialTelegramUpdate, TelegramInlineQueryType, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, DDGQueryResponse, ChatPermissions, };
+import Kanye from './types/Kanye';
+export { Webhook, Command, TelegramCommand, Commands, Kv, Config, localhost, WebhookCommands, Joke, Bored, Balance, TelegramFrom, TelegramChat, TelegramUser, TelegramMessageEntity, TelegramPhotoSize, TelegramMessage, TelegramInputMessageContent, TelegramInlineQuery, Update, TelegramUpdate, PartialTelegramUpdate, TelegramInlineQueryType, TelegramInlineQueryResult, TelegramInlineQueryResultPhoto, TelegramInlineQueryResultArticle, DDGQueryResponse, ChatPermissions, Kanye, };

package/dist/main/src/webhook.js

@@ -1,4 +1,3 @@
-import { JSONResponse } from './libs';
 export default class Webhook {
     api;
     token;
@@ -9,8 +8,8 @@ export default class Webhook {
         this.token = token;
         this.url = url;
         this.commands = {
-            default: () => new Promise(() => JSONResponse({ error: 'Invalid command' }, 400)),
+            default: async () => new Response('Invalid command'),
         };
     }
-    process = async (url) => this.commands[url.searchParams.get('command') ?? '']?.() ?? this.commands.default;
+    process = async (url) => this.commands[url.searchParams.get('command') ?? '']?.() ?? this.commands.default();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebam/cf-workers-telegram-bot",
-  "version": "6.4.0",
+  "version": "6.6.0",
   "description": "serverless telegram bot on cf workers",
   "main": "./dist/main/src/main.js",
   "module": "./dist/main/src/main.js",
@@ -41,5 +41,5 @@
     "typescript": "^5.4.5",
     "typescript-eslint": "^7.8.0"
   },
-  "gitHead": "3908a7cd0ca117b7e641960bb8a20cadaddc307e"
+  "gitHead": "ac79b5c72e1c5379d512ea35dff333c0aca0ff2c"
 }