halbot 1990.1.8 → 1990.1.9

package/index.mjs

@@ -18,10 +18,8 @@ const fetchPrompts = async () => {
             const pmts = parse(resp, { columns: true, skip_empty_lines: true });
             assert(pmts?.length, `Failed to load external prompts: ${source}.`);
             pmts.filter(x => x.act && x.prompt).map(x => {
-                const command = utilitas.ensureString(
-                    x.act, { case: 'SNAKE' }
-                ).slice(0, bot.MAX_MENU_LENGTH);
-                prompts[command] = { command, ...x };
+                const { command, description } = bot.newCommand(x.act, x.act);
+                prompts[command] = { ...x, command, act: description };
             });
         } catch (err) { log(err?.message || err); }
     }

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.8",
+  "version": "1990.1.9",
   "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.4"
+    "utilitas": "^1993.0.7"
   }
 }

package/skills/chat.mjs

@@ -2,7 +2,7 @@ import { utilitas } from 'utilitas';
 
 const onProgress = { onProgress: true };
 const [YOU, BOT, LN2] = ['😸 You:', '🤖️ ', '\n\n'];
-const [joinL1, joinL2] = [a => a.join(`${LN2}---${LN2}`), a => a.join(LN2)];
+const [joinL1, joinL2] = [a => a.join(LN2), a => a.join(LN2)];
 const enrich = name => name === 'Bing' ? `${name} (Sydney)` : name;
 const log = content => utilitas.log(content, import.meta.url);
 
@@ -11,10 +11,10 @@ const action = async (ctx, next) => {
     const [msgs, tts, pms, extra] = [{}, {}, [], {}];
     let [lastMsg, lastSent] = ['', 0];
     const packMsg = options => {
-        const packed = [...ctx.overwrite ? [joinL2([YOU, ctx.overwrite])] : []];
+        const packed = [...ctx._text && !options?.tts ? [joinL2([YOU, ctx.text])] : []];
         const source = options?.tts ? tts : msgs;
         ctx.selectedAi.map(n => packed.push(joinL2([
-            ...ctx.multiAi || !ctx.isDefaultAi(n) || ctx.overwrite ? [`${BOT}${enrich(n)}:`] : [],
+            ...ctx.multiAi || !ctx.isDefaultAi(n) || ctx._text ? [`${BOT}${enrich(n)}:`] : [],
             options?.onProgress ? (
                 source[n] ? `${source[n].trim()} █` : '💬'
             ) : (source[n] || ''),
@@ -39,7 +39,8 @@ const action = async (ctx, next) => {
                         ok(onProgress);
                     }
                 );
-                msgs[n] = ctx.session.config?.render === false ? resp.response : resp.responseRendered;
+                msgs[n] = ctx.session.config?.render === false
+                    ? resp.response : resp.responseRendered;
                 tts[n] = resp.spokenText;
                 extra.buttons = resp?.suggestedResponses?.map?.(label => ({
                     label, text: `/bing ${label}`,

package/skills/engine.mjs

@@ -35,22 +35,14 @@ export const { run, priority, func, help, args } = {
         'Set initial prompt to the AI engine.',
         'Select between AI engines.',
         'Tweak output rendering.',
-        "Tips 1: Set `hello ''` to reset to default initial prompt.",
-        "Tips 2: Set `ai ''` to use default AI engine.",
-        'Tips 3: Set `ai @` to use all AI engines simultaneously.',
-        "Example 1: /set --hello 'Bonjour!'",
-        "Example 1: /set --hello ''",
-        'Example 2: /set --ai ChatGPT',
-        'Example 3: /set --ai Bing',
-        "Example 4: /set --ai ''",
-        'Example 5: /set --ai @',
-        'Example 6: /set --render on',
-        'Example 7: /set --render off',
+        "Tip 1: Set `hello ''` to reset to default initial prompt.",
+        "Tip 2: Set `ai ''` to use default AI engine.",
+        'Tip 3: Set `ai @` to use all AI engines simultaneously.',
     ]),
     args: {
         hello: {
             type: 'string', short: 'h', default: 'Hello!',
-            desc: 'Your initial prompt to the AI engine.',
+            desc: "Change initial prompt: /set --hello 'Bonjour!'",
         },
         ai: {
             type: 'string', short: 'a', default: '',

package/skills/execute.mjs

@@ -1,4 +1,3 @@
-import { bot, shot, utilitas } from 'utilitas';
 
 const action = async (ctx, next) => {
     let prompt = ctx.session.prompts?.[ctx.cmdExt?.cmd] || (
@@ -6,7 +5,7 @@ const action = async (ctx, next) => {
     );
     if (prompt) {
         ctx.clear();
-        ctx.overwrite = ctx.text = prompt;
+        ctx.overwrite(prompt);
     }
     await next();
 };

package/skills/instant.mjs

@@ -27,14 +27,11 @@ export const { run, priority, func, help, cmds } = {
     priority: 20,
     func: action,
     help: bot.lines([
-        'Use an AI engine temporary.',
-        'Example 1: /chatgpt Say hello to ChatGPT!',
-        'Example 2: /bing Say hello to Bing!',
-        'Example 3: /all Say hello to all AI engines!',
+        'Use an AI engine `temporary` without touching your settings.',
     ]),
     cmds: {
-        all: 'Use all AI engines simultaneously temporary.',
-        bing: 'Use Bing as temporary AI engine.',
-        chatgpt: 'Use ChatGPT as temporary AI engine.',
+        all: 'Use all AI engines simultaneously: /all Say hello to all AIs!',
+        chatgpt: 'Use ChatGPT temporary: /chatgpt Say hello to ChatGPT!',
+        bing: 'Use Bing temporary: /bing Say hello to Bing!',
     },
 };

package/skills/prompt.mjs

@@ -61,18 +61,13 @@ export const { run, priority, func, help, cmds } = {
     func: action,
     help: bot.lines([
         'Maintain custom prompts.',
-        `Get prompts from ${ACP}.`,
-        `Tips: Use /clear to end current prompted AI conversation session.`,
-        'Example 1: /prompts',
-        'Example 2: /add code > Code with me.',
-        'Example 3: /del code',
-        'Example 4: /acplist',
-        'Example 5: /acpdetail',
-        'Example 6: /clear',
+        'Example 1: /add code > Code with me.',
+        'Example 2: /del code',
+        `Get interesting prompts from ${ACP}.`,
     ]),
     cmds: {
-        prompts: 'List custom prompts.',
-        add: 'Add or update a custom prompt: `/add [COMMAND] > [PROMPT]`.',
+        prompts: 'List all custom prompts.',
+        add: 'Add or edit a custom prompt: `/add [COMMAND] > [PROMPT]`.',
         del: 'Delete a custom prompt: `/del [COMMAND]`.',
         acplist: `List prompts from ${ACP}.`,
         acpdetail: `Show details of ${ACP}.`,

package/skills/translate.mjs

@@ -1,38 +1,56 @@
-// @todo: This is a temporary solution, and will be replaced by a more elegant solution in the future.
+import { bot } from 'utilitas';
 
-const getTranslatePrompt = (lang) => // https://github.com/yetone/bob-plugin-openai-translator/blob/main/src/main.js
+// 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 the following text into ${lang}: `;
-const getPolishPrompt = () => // https://github.com/yetone/bob-plugin-openai-polisher/blob/main/src/main.js
-    'Revise the following text to make them more clear, concise, and coherent.'
-    + ' Please note that you need to list the changes and briefly explain why: ';
+    + ` 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 action = async (ctx, next) => {
-    switch (ctx.cmdExt?.cmd) {
-        case '2en':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getTranslatePrompt('English'));
+    switch (ctx.cmd.cmd) {
+        case 'translate':
+            ctx.overwrite(getTranslatePrompt(ctx.cmd.args || 'English'));
             break;
-        case '2zh':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getTranslatePrompt('Traditional Chinese'));
+        case 'polish':
+            ctx.overwrite(getPolishPrompt());
             break;
-        case '2zht':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getTranslatePrompt('Traditional Chinese'));
+        case 'toen':
+            ctx.overwrite(getTranslatePrompt('English'));
             break;
-        case '2zhs':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getTranslatePrompt('Simplified Chinese'));
+        case 'tofr':
+            ctx.overwrite(getTranslatePrompt('French'));
             break;
-        case '2fr':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getTranslatePrompt('French'));
+        case 'tozht':
+            ctx.overwrite(getTranslatePrompt('Traditional Chinese'));
             break;
-        case 'p':
-            ctx.text = ctx.text.replace(`/${ctx.cmdExt?.cmd}`, getPolishPrompt());
+        case 'tozhs':
+            ctx.overwrite(getTranslatePrompt('Simplified Chinese'));
             break;
     }
     await next();
 };
 
-export const { run, priority, func } = {
+export const { run, priority, func, cmds, help } = {
     run: true,
     priority: 50,
     func: action,
+    help: bot.lines([
+        'Prompt the AI engine to translate or polish your text.',
+        'If `TO_LANG` is not specified, English is used by default.',
+        'Example: /translate français',
+    ]),
+    cmds: {
+        translate: 'Translate your text to any language: /translate `TO_LANG`',
+        polish: 'Polish your text.',
+        toen: 'Translate your text to English.',
+        tofr: 'Translate your text to French.',
+        tozht: 'Translate your text to Traditional Chinese.',
+        tozhs: 'Translate your text to Simplified Chinese.',
+    },
 };