halbot 1990.1.14 → 1990.1.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another ChatGPT/Bing Chat Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1990.1.14",
+  "version": "1990.1.15",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -36,6 +36,6 @@
     "ioredis": "^5.3.1",
     "mysql2": "^3.2.0",
     "telegraf": "^4.12.2",
-    "utilitas": "^1993.0.10"
+    "utilitas": "^1993.0.12"
   }
 }

package/skills/chat.mjs

@@ -1,5 +1,7 @@
 import { utilitas } from 'utilitas';
 
+// @todo: consider using md v2, see https://core.telegram.org/bots/api#markdownv2-style.
+
 const onProgress = { onProgress: true };
 const [YOU, BOT, LN2] = ['😸 You:', '🤖️ ', '\n\n'];
 const [joinL1, joinL2] = [a => a.join(LN2), a => a.join(LN2)];
@@ -8,7 +10,7 @@ const log = content => utilitas.log(content, import.meta.url);
 
 const action = async (ctx, next) => {
     if (!ctx.text) { return await next(); }
-    const [msgs, tts, pms, extra] = [{}, {}, [], {}];
+    const [msgs, ctxs, tts, pms, extra] = [{}, {}, {}, [], {}];
     let [lastMsg, lastSent] = ['', 0];
     const packMsg = options => {
         const packed = [...ctx._text && !options?.tts ? [joinL2([YOU, ctx.text])] : []];
@@ -20,9 +22,10 @@ const action = async (ctx, next) => {
             ) : (source[n] || '');
             pure.push(content);
             packed.push(joinL2([
-                ...ctx.multiAi || !ctx.isDefaultAi(n) || ctx._text ? [`${BOT}${enrich(n)}:`] : [],
-                content,
-            ]))
+                ...ctx.multiAi || !ctx.isDefaultAi(n) || ctx._text || ctxs[n]?.cmd ? [
+                    `${BOT}${enrich(n)}${ctxs[n]?.cmd && ` > \`${ctxs[n].cmd}\` (exit by /clear)` || ''}:`
+                ] : [], content,
+            ]));
         });
         return options?.tts && !pure.join('').trim().length ? '' : joinL1(packed);
     };
@@ -38,15 +41,16 @@ const action = async (ctx, next) => {
     for (let n of ctx.selectedAi) {
         pms.push((async () => {
             try {
-                const resp = await ctx._.ai[n].send(
-                    ctx.text, { session: ctx.chatId }, tkn => {
-                        msgs[n] = `${(msgs[n] || '')}${tkn}`;
-                        ok(onProgress);
-                    }
-                );
+                const resp = await ctx._.ai[n].send(ctx.text, {
+                    session: ctx.chatId, context: ctx.context
+                }, token => {
+                    msgs[n] = `${(msgs[n] || '')}${token}`;
+                    ok(onProgress);
+                });
+                ctxs[n] = resp.context;
                 msgs[n] = ctx.session.config?.render === false
                     ? resp.response : resp.responseRendered;
-                tts[n] = resp.spokenText;
+                tts[n] = msgs[n].split('\n').some(x => /^```/.test(x)) ? '' : resp.spokenText;
                 extra.buttons = resp?.suggestedResponses?.map?.(label => ({
                     label, text: `/bing ${label}`,
                 }));

package/skills/execute.mjs

@@ -1,10 +1,10 @@
 
 const action = async (ctx, next) => {
-    let prompt = ctx.session.prompts?.[ctx.cmdExt?.cmd] || (
-        ctx._.prompts[ctx.cmdExt?.cmd] && ctx._.prompts[ctx.cmdExt.cmd].prompt
-    );
+    const prompt = ctx.session.prompts?.[ctx.cmdExt?.cmd]
+        || ctx._.prompts?.[ctx.cmdExt?.cmd]?.prompt;
     if (prompt) {
         ctx.clear();
+        ctx.context = { cmd: ctx.cmdExt.cmd, prompt };
         ctx.overwrite(prompt);
     }
     await next();

package/skills/wording.mjs

@@ -1,16 +1,22 @@
 import { bot, utilitas } from 'utilitas';
 
+const execPrompt = (ctx, arrLines) => ctx.overwrite((ctx.context = {
+    cmd: ctx.cmd.cmd, prompt: bot.lines(arrLines),
+}).prompt);
+
 // Inspired by:
 // https://github.com/yetone/bob-plugin-openai-translator/blob/main/src/main.js
-const getTranslatePrompt = lang =>
-    'You are a translation engine that can only translate text and cannot interpret it.'
-    + ` Translate all the following text I send to you to ${lang}.`;
+const promptTranslate = (ctx, lang) => execPrompt(ctx, [
+    'You are a translation engine that can only translate text and cannot interpret it.',
+    `Translate all the following text I send to you to ${lang}.`
+]);
 
 // Inspired by:
 // https://github.com/yetone/bob-plugin-openai-polisher/blob/main/src/main.js
-const getPolishPrompt = () =>
-    'Revise all the following text I send to you to make them more clear, concise, and coherent.'
-    + ' Please note that you need to list the changes and briefly explain why.';
+const promptPolish = ctx => execPrompt(ctx, [
+    'Revise all the following text I send to you to make them more clear, concise, and coherent.',
+    'Please note that you need to list the changes and briefly explain why.',
+]);
 
 const action = async (ctx, next) => {
     switch (ctx.cmd.cmd) {
@@ -31,24 +37,12 @@ const action = async (ctx, next) => {
             await utilitas.timeout(1000);
             await ctx.hello();
             break;
-        case 'translate':
-            ctx.overwrite(getTranslatePrompt(ctx.cmd.args || ctx.session.config?.lang || ctx._.lang));
-            break;
-        case 'polish':
-            ctx.overwrite(getPolishPrompt());
-            break;
-        case 'toen':
-            ctx.overwrite(getTranslatePrompt('English'));
-            break;
-        case 'tofr':
-            ctx.overwrite(getTranslatePrompt('French'));
-            break;
-        case 'tozht':
-            ctx.overwrite(getTranslatePrompt('Traditional Chinese'));
-            break;
-        case 'tozhs':
-            ctx.overwrite(getTranslatePrompt('Simplified Chinese'));
-            break;
+        case 'translate': promptTranslate(ctx, ctx.cmd.args || ctx.session.config?.lang || ctx._.lang); break;
+        case 'polish': promptPolish(ctx); break;
+        case 'toen': promptTranslate(ctx, 'English'); break;
+        case 'tofr': promptTranslate(ctx, 'French'); break;
+        case 'tozht': promptTranslate(ctx, 'Traditional Chinese'); break;
+        case 'tozhs': promptTranslate(ctx, 'Simplified Chinese'); break;
     }
     await next();
 };