halbot 1995.1.3 → 1995.1.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another AI powered Telegram bot, which is simple design, easy to use, extendable and fun.",
-  "version": "1995.1.3",
+  "version": "1995.1.5",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -32,7 +32,7 @@
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
     "@ffprobe-installer/ffprobe": "^2.1.2",
     "@google-cloud/discoveryengine": "^2.5.2",
-    "@google/genai": "^1.33.0",
+    "@google/genai": "^1.34.0",
     "@mozilla/readability": "^0.6.0",
     "fluent-ffmpeg": "^2.1.3",
     "google-gax": "^5.0.6",
@@ -40,14 +40,15 @@
     "jsdom": "^27.3.0",
     "lorem-ipsum": "^2.0.8",
     "mime": "^4.1.0",
-    "mysql2": "^3.15.3",
+    "mysql2": "^3.16.0",
     "office-text-extractor": "^3.0.3",
-    "openai": "^6.10.0",
+    "openai": "^6.15.0",
     "pg": "^8.16.3",
     "pgvector": "^0.2.1",
     "telegraf": "^4.16.3",
+    "tellegram": "^1.1.2",
     "tesseract.js": "^7.0.0",
-    "utilitas": "^2001.1.77",
+    "utilitas": "^2001.1.84",
     "youtube-transcript": "^1.2.1"
   }
 }

package/pipeline/010_broca.mjs

@@ -1,12 +1,12 @@
 import { alan, bot, hal, uoid, utilitas } from '../index.mjs';
+import { paginate } from 'tellegram';
 
 const _name = 'Broca';
 const [PRIVATE_LIMIT, GROUP_LIMIT] = [60 / 60, 60 / 20].map(x => x * 1000);
 const log = (c, o) => utilitas.log(c, _name, { time: 1, ...o || {} });
 const getKey = s => s?.toLowerCase?.()?.startsWith?.('http') ? 'url' : 'source';
 const isMarkdownError = e => e?.description?.includes?.("can't parse entities");
-
-const [CALLBACK_LIMIT, parse_mode] = [30, bot.parse_mode];
+const [CALLBACK_LIMIT, parse_mode] = [30, bot.PARSE_MODE_MD_V2];
 
 const KNOWN_UPDATE_TYPES = [
     'callback_query', 'channel_post', 'edited_message', 'message',
@@ -54,8 +54,8 @@ const resp = async (ctx, text, md, extra) => {
             resp = await (extra?.reply_parameters?.message_id
                 ? ctx.replyWithMarkdown(text, { parse_mode, ...extra })
                 : ctx.sendMessage(text, { parse_mode, ...extra }));
-        } catch (err) { // utilitas.throwError('Error sending message.');
-            isMarkdownError(err) || log(err);
+        } catch (err) {
+            log(err);
             await ctx.timeout();
         }
     }
@@ -81,8 +81,8 @@ const edit = async (ctx, lastMsgId, text, md, extra) => {
             resp = await ctx.telegram.editMessageText(
                 ctx._.chatId, lastMsgId, '', text, { parse_mode, ...extra }
             );
-        } catch (err) { // utilitas.throwError('Error editing message.');
-            isMarkdownError(err) || log(err);
+        } catch (err) {
+            log(err);
             await ctx.timeout();
         }
     }
@@ -125,7 +125,7 @@ const ctxExt = ctx => {
     ctx.edit = async (lastMsgId, text, md, extra) =>
         await edit(ctx, lastMsgId, text, md, extra);
     ctx.ok = async (message, options) => {
-        let pages = bot.paging(message, options);
+        let pages = paginate(message, options);
         const extra = ctx.getExtra(options);
         const [pageIds, pageMap] = [[], {}];
         options?.pageBreak || ctx._.done.filter(x => x).map(x => {
@@ -135,22 +135,13 @@ const ctxExt = ctx => {
         for (let i in pages) {
             const lastPage = ~~i === pages.length - 1;
             const shouldExtra = options?.lastMessageId || lastPage;
-            if (options?.onProgress && !options?.lastMessageId
-                && pageMap[pageIds[~~i]]?.text === pages[i]) { continue; }
-            if (options?.onProgress && !pageIds[~~i]) {                     // progress: new page, reply text
-                await ctx.resp(pages[i], false, extra);
-            } else if (options?.onProgress) {                               // progress: ongoing, edit text
-                await ctx.edit(
-                    pageIds[~~i], pages[i], false, shouldExtra ? extra : {}
-                );
-            } else if (options?.lastMessageId || pageIds[~~i]) {            // progress: final, edit markdown
-                await ctx.edit(
-                    options?.lastMessageId || pageIds[~~i],
-                    pages[i], true, shouldExtra ? extra : {}
-                );
-            } else {                                                        // never progress, reply markdown
-                await ctx.resp(pages[i], true, extra);
+            const _extra = shouldExtra ? extra : {};
+            const lastMsgId = ~~(options?.lastMessageId || pageIds[~~i]);
+            if (lastMsgId && pageMap[lastMsgId]?.text === pages[i]) {
+                continue;
             }
+            await (lastMsgId ? ctx.edit(lastMsgId, pages[i], options?.md, _extra) // ongoing, edit
+                : ctx.resp(pages[i], options?.md, _extra));                       // new page, reply
             await ctx.timeout();
         }
         return ctx._.done;
@@ -256,6 +247,7 @@ const action = async (ctx, next) => {
     await ctx.shouldReply(errStr);
 };
 
-export const { name, run, priority, func } = {
-    name: _name, run: true, priority: 10, func: action,
+export const { _NEED, name, run, priority, func } = {
+    _NEED: ['telegramifyMarkdown'], name: _name,
+    run: true, priority: 10, func: action,
 };

package/pipeline/030_echo.mjs

@@ -38,7 +38,7 @@ const action = async (ctx, next) => {
             await ctx.ok(bot.EMOJI_THINKING);
             for (let i = 0; i < 2; i++) {
                 await ctx.timeout();
-                await ctx.ok(ipsum(), { ...extra, onProgress: true });
+                await ctx.ok(ipsum(), { ...extra, processing: true });
             }
             await ctx.timeout();
             await ctx.ok(ipsum(), { ...extra, md });

package/pipeline/090_ai.mjs

@@ -5,17 +5,19 @@ const TOP = 'top';
 
 const listAIs = async ctx => {
     const lastMessageId = ctx?.update?.callback_query?.message?.message_id;
-    const message = `Features:\n`
-        + hal.uList(Object.entries(alan.FEATURE_ICONS).map(
-            x => `${x[1]} ${x[0]}`
-        )) + `\n\nAI${ais.length > 0 ? 's' : ''}:\n`;
+    const message = `*Time:* \n${new Date().toLocaleString()}\n\n`
+        + `*Features:*\n` + hal.uList(Object.entries(alan.FEATURE_ICONS).filter(
+            x => x[0] !== 'hidden'
+        ).map(
+            x => `${x[1]} \`${x[0]}\``
+        )) + `\n\n*AI${ais.length > 0 ? 's' : ''}:*\n`;
     const buttons = ais.map((x, i) => ({
         label: `${ctx._.session.config?.ai === x.id
             || (!ctx._.session.config?.ai && i === 0) ? `${hal.CHECK} `
-            : ''}${x.name}: ${x.features}`,
+            : ''}${x.label}`,
         text: `/set --ai=${x.id}`,
     }));
-    return await ctx.ok(message, { lastMessageId, buttons });
+    return await ctx.ok(message, { lastMessageId, buttons, md: true });
 };
 
 const action = async (ctx, next) => {