halbot 1995.1.6 → 1995.1.7

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.6",
+  "version": "1995.1.7",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",

package/pipeline/010_broca.mjs

@@ -50,20 +50,19 @@ const resp = async (ctx, text, md, extra) => {
     // }
     let resp;
     if (md) {
-        try {
-            resp = await (extra?.reply_parameters?.message_id
-                ? ctx.replyWithMarkdown(text, { parse_mode, ...extra })
-                : ctx.sendMessage(text, { parse_mode, ...extra }));
-        } catch (err) {
-            log(err);
-            await ctx.timeout();
-        }
+        resp = await utilitas.ignoreErrFunc(async (
+        ) => await (extra?.reply_parameters?.message_id
+            ? ctx.replyWithMarkdown(text, { parse_mode, ...extra })
+            : ctx.sendMessage(text, { parse_mode, ...extra })), hal.logOptions);
+    }
+    if (!resp) {
+        await ctx.timeout();
+        resp = await utilitas.ignoreErrFunc(
+            async () => await (extra?.reply_parameters?.message_id
+                ? ctx.reply(text, extra) : ctx.sendMessage(text, extra)
+            ), hal.logOptions
+        );
     }
-    resp || (resp = await utilitas.ignoreErrFunc(
-        async () => await (extra?.reply_parameters?.message_id
-            ? ctx.reply(text, extra) : ctx.sendMessage(text, extra)
-        ), hal.logOptions
-    ));
     resp && ctx._.done.push(resp);
     return resp;
 };
@@ -77,19 +76,18 @@ const replyWith = async (ctx, func, src, options) => ctx._.done.push(
 const edit = async (ctx, lastMsgId, text, md, extra) => {
     let resp;
     if (md) {
-        try {
-            resp = await ctx.telegram.editMessageText(
-                ctx._.chatId, lastMsgId, '', text, { parse_mode, ...extra }
-            );
-        } catch (err) {
-            log(err);
-            await ctx.timeout();
-        }
+        resp = await utilitas.ignoreErrFunc(async (
+        ) => await ctx.telegram.editMessageText(
+            ctx._.chatId, lastMsgId, '', text, { parse_mode, ...extra }
+        ), hal.logOptions);
+    }
+    if (!resp) {
+        await ctx.timeout();
+        resp = await utilitas.ignoreErrFunc(async (
+        ) => await ctx.telegram.editMessageText(
+            ctx._.chatId, lastMsgId, '', text, extra
+        ), hal.logOptions);
     }
-    resp || (resp = await utilitas.ignoreErrFunc(async (
-    ) => await ctx.telegram.editMessageText(
-        ctx._.chatId, lastMsgId, '', text, extra
-    ), hal.logOptions));
     resp && ctx._.done.push(resp);
     return resp;
 };
@@ -148,14 +146,15 @@ const ctxExt = ctx => {
     };
     ctx.err = async (m, opts) => {
         log(m);
-        return await ctx.ok(`⚠️ ${m?.message || m} `, opts);
+        return await ctx.ok(`${bot.EMOJI_WARNING} ${m?.message || m} `, opts);
     };
-    ctx.shouldReply = async text => {
+    ctx.shouldReply = async (text, options) => {
         const should = utilitas.insensitiveHas(hal._?.chatType, ctx._.chatType)
             || ctx._.session?.config?.chatty;
         text = utilitas.isSet(text, true) ? (text || '') : '';
         if (!should || !text) { return should; }
-        return await ctx.ok(text);
+        return await (options?.error
+            ? ctx.err(text, options) : ctx.ok(text, options));
     };
     ctx.finish = () => ctx._.done.unshift(null);
     ctx.complete = async (options) => await ctx.ok(hal.CHECK, options);
@@ -241,10 +240,10 @@ const action = async (ctx, next) => {
     await sessionSet(ctx._.chatId, ctx._.session);
     // fallback response and log
     if (ctx._.done.length) { return; }
-    const errStr = '⚠️ ' + (ctx._.cmd?.cmd
-        ? `Command not found: /${ctx._.cmd.cmd}` : 'No suitable response.');
+    const errStr = ctx._.cmd?.cmd
+        ? `Command not found: /${ctx._.cmd.cmd}` : 'No suitable response.';
     log(`INFO: ${errStr}`);
-    await ctx.shouldReply(errStr);
+    await ctx.shouldReply(errStr, { error: true });
 };
 
 export const { _NEED, name, run, priority, func } = {

package/pipeline/020_cmd.mjs

@@ -68,6 +68,15 @@ const action = async (ctx, next) => {
         case 'clearkb':
             return await ctx.complete({ keyboards: [] });
     }
+    // update commands
+    await utilitas.ignoreErrFunc(async () =>
+        await hal._.bot.telegram.setMyCommands(hal._.cmds.sort((x, y) =>
+            (ctx._.session?.cmds?.[y.command.toLowerCase()]?.touchedAt || 0)
+            - (ctx._.session?.cmds?.[x.command.toLowerCase()]?.touchedAt || 0)
+        ).slice(0, hal.COMMAND_LIMIT), {
+            scope: { type: 'chat', chat_id: ctx._.chatId },
+        }), hal.logOptions
+    );
     // next middleware
     await next();
 };

package/pipeline/080_history.mjs

@@ -35,17 +35,6 @@ const memorize = async (ctx) => {
         }
         await hal._.storage?.client?.upsert?.(hal.table, event, { skipEcho: true });
     }, hal.logOptions);
-    // TODO: 調整，如果命令執行過，應該更新菜單 ！？
-    await utilitas.ignoreErrFunc(async () => await hal._.bot.telegram.setMyCommands([
-        ...hal._.cmds, ...Object.keys(ctx._.message.prompts || {}).map(
-            command => hal.newCommand(command, ctx._.message.prompts[command])
-        )
-    ].sort((x, y) =>
-        (ctx._.message?.cmds?.[y.command.toLowerCase()]?.touchedAt || 0)
-        - (ctx._.message?.cmds?.[x.command.toLowerCase()]?.touchedAt || 0)
-    ).slice(0, hal.COMMAND_LIMIT), {
-        scope: { type: 'chat', chat_id: ctx._.chatId },
-    }), hal.logOptions);
 };
 
 const ctxExt = ctx => {
@@ -82,7 +71,6 @@ const action = async (ctx, next) => {
                 });
                 await ctx.timeout();
             }
-            // TODO: NEED MORE DEBUG
             result.length === hal.SEARCH_LIMIT && await ctx.resp(
                 '___', true, ctx.getExtra({
                     buttons: [{