@codebam/cf-workers-telegram-bot 5.7.0 → 5.9.0

package/dist/main/src/bot_api.js

@@ -1,14 +1,11 @@
-import Handler from "./handler";
-import { Webhook, localhost } from "./types";
 export default class BotApi {
     commands;
     webhook;
     handler;
     update;
     constructor(config) {
-        this.commands = config.commands || {};
-        this.webhook =
-            config.webhook || new Webhook(new URL(localhost), "", new URL(localhost));
-        this.handler = config.handler || new Handler([]);
+        this.commands = config.commands;
+        this.webhook = config.webhook;
+        this.handler = config.handler;
     }
 }

package/dist/main/src/telegram_api.js

@@ -31,8 +31,12 @@ export default class TelegramApi extends BotApi {
         ? ((text_args) => ((command) => this.commands[command]
             ? this.commands[command]?.(this, update, [...text_args, ...args])
             : log({
-                error: `command '${command}' does not exist`,
-            }) && this.updates.default)(
+                error: `command '${command}' does not exist, using default`,
+            }) &&
+                this.commands["default"]?.(this, update, [
+                    ...text_args,
+                    ...args,
+                ]))(
         // run the command
         this.getCommand(text_args)))(
         // get the command to run

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

@@ -5,7 +5,10 @@ export default class TelegramBot extends TelegramApi {
     url: URL;
     kv: Kv;
     get_set: KVNamespace;
+    ai: any;
     constructor(config: Config);
+    question: (update: TelegramUpdate, args: string[]) => Promise<Response>;
+    paste: (update: TelegramUpdate, args: string[]) => Promise<Response>;
     code: (update: TelegramUpdate) => Promise<Response>;
     duckduckgo: (update: TelegramUpdate, args: string[]) => Promise<Response>;
     kanye: (update: TelegramUpdate) => Promise<Response>;

package/dist/main/src/telegram_bot.js

@@ -1,16 +1,51 @@
 import { preTagString, prettyJSON, addSearchParams, responseToJSON, } from "./libs";
 import TelegramApi from "./telegram_api";
 import { TelegramInlineQueryResultArticle, TelegramInlineQueryResultPhoto, } from "./types";
+import { Ai } from "@cloudflare/ai";
 export default class TelegramBot extends TelegramApi {
     url;
     kv;
     get_set;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ai;
     constructor(config) {
         super(config.commands, config.webhook, config.handler);
         this.url = config.url;
         this.kv = config.kv;
         this.get_set = config.kv?.get_set;
+        this.ai = config.ai;
     }
+    // bot command: /question
+    question = async (update, args) => {
+        const ai = new Ai(this.ai);
+        let prompt;
+        if (args[0][0] === "/") {
+            prompt = args.slice(1).join(" ");
+        }
+        else {
+            prompt = args.join(" ");
+        }
+        console.log({ prompt });
+        if (prompt === "") {
+            prompt = "no prompt specified";
+        }
+        const { response } = await ai.run("@cf/meta/llama-2-7b-chat-int8", {
+            prompt,
+        });
+        return this.sendMessage(update.message?.chat.id ?? 0, response);
+    };
+    // bot command: /paste
+    paste = async (update, args) => {
+        const formdata = new FormData();
+        formdata.append("upload", args.slice(1).join(" "));
+        const request = await fetch("https://pastebin.seanbehan.ca", {
+            method: "POST",
+            body: formdata,
+            redirect: "manual",
+        });
+        const url = request.headers.get("location");
+        return this.sendMessage(update.message?.chat.id ?? 0, url ?? "failed to upload");
+    };
     // bot command: /code
     code = async (update) => ((url) => update.inline_query
         ? this.answerInlineQuery(update.inline_query.id, [
@@ -54,9 +89,16 @@ export default class TelegramBot extends TelegramApi {
                 : "")))
             : this.sendMessage(update.message?.chat.id ?? 0, duckduckgo_url))(query === ""
         ? "https://duckduckgo.com"
-        : addSearchParams(new URL("https://duckduckgo.com"), {
-            q: query,
-        }).href))(args.slice(1).join(" "));
+        : (() => {
+            if (query[0][0] !== "/") {
+                return addSearchParams(new URL("https://duckduckgo.com"), {
+                    q: query,
+                }).href;
+            }
+            return addSearchParams(new URL("https://duckduckgo.com"), {
+                q: query.split(" ").slice(1).join(" "),
+            }).href;
+        })()))(args.join(" "));
     // bot command: /kanye
     kanye = async (update) => fetch("https://api.kanye.rest")
         .then((response) => responseToJSON(response))
@@ -123,20 +165,20 @@ export default class TelegramBot extends TelegramApi {
     _average = (numbers) => parseFloat((numbers.reduce((prev, cur) => prev + cur, 0) / numbers.length || 0).toFixed(2));
     // bot command: /recursion
     recursion = async (update) => this.sendMessage(update.message?.chat.id ?? 0, "/recursion");
-    // .then((response) => responseToJSON(response))
-    // .then((result: { ok: boolean; result: { text: string } }) =>
-    //   this.handler.postResponse(
-    //     new Request("", {
-    //       method: "POST",
-    //       body: JSON.stringify({
-    //         message: {
-    //           text: result.result.text,
-    //           chat: { id: update.message.chat.id },
-    //         },
-    //       }),
-    //     }),
-    //     this
-    //   )
+    // .then((response) => response.json())
+    // .then((result) =>
+    // 	this.handler.postResponse(
+    // 		new Request("", {
+    // 			method: "POST",
+    // 			body: JSON.stringify({
+    // 				message: {
+    // 					text: (result as { result: { text: string } }).result.text,
+    // 					chat: { id: update.message?.chat.id },
+    // 				},
+    // 			}),
+    // 		}),
+    // 		this
+    // 	)
     // );
     // bot command: /roll
     roll = async (update, args) => ((outcome, message) => update.inline_query

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

@@ -14,6 +14,8 @@ export default class TelegramCommands {
     static _get: (bot: TelegramBot, update: TelegramUpdate, args: string[]) => Promise<Response>;
     static _set: (bot: TelegramBot, update: TelegramUpdate, args: string[]) => Promise<Response>;
     static duckduckgo: (bot: TelegramBot, update: TelegramUpdate, args: string[]) => Promise<Response>;
+    static paste: (bot: TelegramBot, update: TelegramUpdate, args: string[]) => Promise<Response>;
+    static question: (bot: TelegramBot, update: TelegramUpdate, args: string[]) => Promise<Response>;
     static code: (bot: TelegramBot, update: TelegramUpdate) => Promise<Response>;
     static commandList: (bot: TelegramBot, update: TelegramUpdate) => Promise<Response>;
 }

package/dist/main/src/telegram_commands.js

@@ -11,6 +11,8 @@ export default class TelegramCommands {
     static _get = async (bot, update, args) => bot._get(update, args);
     static _set = async (bot, update, args) => bot._set(update, args);
     static duckduckgo = async (bot, update, args) => bot.duckduckgo(update, args);
+    static paste = async (bot, update, args) => bot.paste(update, args);
+    static question = async (bot, update, args) => bot.question(update, args);
     static code = async (bot, update) => bot.code(update);
     static commandList = async (bot, update) => bot.commandList(update);
 }

package/dist/main/src/telegram_webhook.js

@@ -14,7 +14,6 @@ export default class TelegramWebhook extends Webhook {
     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`));
     commands = {
-        ...this.commands,
         set: this.set,
         get: this.get,
         delete: this.delete,

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

@@ -16,6 +16,7 @@ export declare class Config {
     kv: Kv;
     url: URL;
     handler: Handler;
+    ai: any;
     constructor(config?: Partial<Config>);
 }
 export declare const localhost: URL;

package/dist/main/src/types.js

@@ -10,6 +10,8 @@ export class Config {
     kv;
     url;
     handler;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    ai;
     constructor(config = {}) {
         this.bot_name = config.bot_name || "";
         this.api = config.api || BotApi;
@@ -18,6 +20,7 @@ export class Config {
         this.kv = config.kv;
         this.url = config.url || new URL(localhost);
         this.handler = config.handler || new Handler([]);
+        this.ai = config.ai;
     }
 }
 export const localhost = new URL("http://localhost");

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

@@ -5,6 +5,7 @@ interface Environment {
     KV_UID_DATA: KVNamespace;
     SECRET_TELEGRAM_API_TOKEN2: string;
     SECRET_TELEGRAM_API_TOKEN3: string;
+    AI: string;
 }
 declare const _default: {
     fetch: (request: Request, env: Environment) => Promise<Response>;

package/dist/worker/src/worker.js

@@ -6,6 +6,7 @@ export default {
             api: TelegramBot,
             webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN}`), env.SECRET_TELEGRAM_API_TOKEN, new URL(new URL(request.url).origin)),
             commands: {
+                default: TelegramCommands.question,
                 "/ping": TelegramCommands.ping,
                 "/toss": TelegramCommands.toss,
                 "/epoch": TelegramCommands.epoch,
@@ -19,37 +20,46 @@ export default {
                 "/set": TelegramCommands._set,
                 "/duckduckgo": TelegramCommands.duckduckgo,
                 "/code": TelegramCommands.code,
+                "/paste": TelegramCommands.paste,
                 "/commands": TelegramCommands.commandList,
+                "/question": TelegramCommands.question,
                 "/help": TelegramCommands.commandList,
                 "/start": TelegramCommands.commandList,
             },
             kv: { get_set: env.KV_GET_SET, uid_data: env.KV_UID_DATA },
+            ai: env.AI,
         },
         {
             bot_name: "@duckduckbot",
             api: TelegramBot,
             webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN2}`), env.SECRET_TELEGRAM_API_TOKEN2, new URL(new URL(request.url).origin)),
             commands: {
+                default: TelegramCommands.duckduckgo,
                 inline: TelegramCommands.duckduckgo,
                 "/duckduckgo": TelegramCommands.duckduckgo,
+                "/question": TelegramCommands.question,
                 "/code": TelegramCommands.code,
                 "/commands": TelegramCommands.commandList,
                 "/help": TelegramCommands.commandList,
                 "/start": TelegramCommands.commandList,
             },
+            ai: env.AI,
         },
         {
             bot_name: "@ddggbot",
             api: TelegramBot,
             webhook: new TelegramWebhook(new URL(`https://api.telegram.org/bot${env.SECRET_TELEGRAM_API_TOKEN3}`), env.SECRET_TELEGRAM_API_TOKEN3, new URL(new URL(request.url).origin)),
             commands: {
+                default: TelegramCommands.duckduckgo,
                 inline: TelegramCommands.duckduckgo,
                 "/duckduckgo": TelegramCommands.duckduckgo,
+                "/question": TelegramCommands.question,
                 "/code": TelegramCommands.code,
                 "/commands": TelegramCommands.commandList,
                 "/help": TelegramCommands.commandList,
                 "/start": TelegramCommands.commandList,
             },
+            ai: env.AI,
         },
     ]).handle(request),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "5.7.0",
+	"version": "5.9.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main/src/main.js",
 	"module": "./dist/main/src/main.js",
@@ -29,14 +29,17 @@
 		"url": "https://github.com/codebam/cf-workers-telegram-bot.git"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20230807.0",
-		"@typescript-eslint/eslint-plugin": "^6.3.0",
-		"@typescript-eslint/parser": "^6.3.0",
-		"eslint": "^8.47.0",
+		"@cloudflare/workers-types": "^4.20230922.0",
+		"@typescript-eslint/eslint-plugin": "^6.7.3",
+		"@typescript-eslint/parser": "^6.7.3",
+		"eslint": "^8.50.0",
 		"eslint-config-prettier": "^9.0.0",
-		"lerna": "^7.1.5",
-		"prettier": "^3.0.1",
-		"typescript": "^5.1.6"
+		"lerna": "^7.3.0",
+		"prettier": "^3.0.3",
+		"typescript": "^5.2.2"
 	},
-	"gitHead": "636be817961219f3407aa2d61d9345e388d9a21d"
+	"dependencies": {
+		"@cloudflare/ai": "^1.0.14"
+	},
+	"gitHead": "0a031fe9156731fae4ac19f9068ee2f42bd14074"
 }