halbot 1989.6.30 → 1989.6.32

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another ChatGPT/Bing Telegram bob.",
-  "version": "1989.6.30",
+  "version": "1989.6.32",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -33,6 +33,6 @@
     "@google-cloud/text-to-speech": "^4.2.1",
     "@waylaidwanderer/chatgpt-api": "^1.32.10",
     "telegraf": "^4.12.2",
-    "utilitas": "^1992.4.39"
+    "utilitas": "^1992.4.40"
   }
 }

package/skills/ai.mjs

@@ -2,29 +2,30 @@ 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}---${LN2}`), a => a.join(LN2)];
 const enrich = name => name === 'Bing' ? `${name} (Sydney)` : name;
 
 const action = async (ctx, next) => {
-    if (ctx.end || !ctx.text) { return await next(); }
+    if (!ctx.text) { return await next(); }
     const [multiAi, msgs, tts, pms, extra]
         = [ctx.session.ai.size > 1, {}, {}, [], {}];
     let [lastMsg, lastSent] = ['', 0];
-    const packMsg = (options) => {
-        const packed = [...ctx.stt ? joinL2([YOU, ctx.stt]) : []];
+    const packMsg = options => {
+        const packed = [...ctx.overwrite ? [joinL2([YOU, ctx.overwrite])] : []];
         const source = options?.tts ? tts : msgs;
         for (let name of ctx.session.ai.size ? ctx.session.ai : [ctx.firstAi]) {
             const defaultAi = name === ctx.firstAi;
             packed.push(joinL2([
-                ...multiAi || !defaultAi || ctx.stt ? [`${BOT}${enrich(name)}:`] : [],
+                ...multiAi || !defaultAi || ctx.overwrite ? [`${BOT}${enrich(name)}:`] : [],
                 options?.onProgress ? (
-                    source[name] ? `${source[name].trim()} |` : '...'
+                    source[name] ? `${source[name].trim()} █` : '💬'
                 ) : (source[name] || ''),
             ]));
         }
+        console.log(packed);
         return joinL1(packed);
     };
-    const ok = async (options) => {
+    const ok = async options => {
         const [curTime, curMsg] = [Date.now(), packMsg(options)];
         if (options?.onProgress && (
             curTime - lastSent < ctx.limit || lastMsg === curMsg

package/skills/cmd.mjs

@@ -3,7 +3,7 @@ import { utilitas } from 'utilitas';
 const matchReg = /^\/([^\ ]*)(.*)$/ig;
 
 const action = async (ctx, next) => {
-    if (ctx.end || !ctx.text) { return await next(); }
+    if (!ctx.text) { return await next(); }
     ctx.session.ai || (ctx.session.ai = new Set());
     const curAi = new Set();
     ctx.cmd = ctx.text.split('\n')?.[0]?.replace(matchReg, '$1');

package/skills/translate.mjs

@@ -6,7 +6,7 @@ const getPolishPrompt = () => // https://github.com/yetone/bob-plugin-openai-pol
     + ' Please note that you need to list the changes and briefly explain why: ';
 
 const action = async (ctx, next) => {
-    if (ctx.end || !ctx.text) { return await next(); }
+    if (!ctx.text) { return await next(); }
     switch (ctx.cmd) {
         case '2en':
             ctx.text = ctx.text.replace(`/${ctx.cmd}`, getTranslatePrompt('English'));