halbot 1989.6.23 → 1989.6.25

package/bin/halbot.mjs

@@ -27,8 +27,6 @@ const log = content => utilitas.log(content, import.meta.url);
 // })();
 
 try {
-    const { config } = await storage.getConfig(
-        ...debug ? [{ pack: './package.json' }] : [], // utilitas debug
-    );
+    const { config } = await storage.getConfig({ pack: { name: 'halbot' } });
     await halbot(config);
 } catch (err) { debug ? utilitas.throwError(err) : log(err); }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another ChatGPT/Bing Telegram bob.",
-  "version": "1989.6.23",
+  "version": "1989.6.25",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -31,9 +31,9 @@
   "dependencies": {
     "@google-cloud/speech": "^5.4.0",
     "@google-cloud/text-to-speech": "^4.2.1",
-    "@waylaidwanderer/chatgpt-api": "^1.28.10",
+    "@waylaidwanderer/chatgpt-api": "^1.30.0",
     "telegraf": "^4.12.2",
-    "utilitas": "^1992.3.43"
+    "utilitas": "^1992.3.44"
   },
   "devDependencies": {}
 }

package/skills/ai.mjs

@@ -46,7 +46,7 @@ const action = async (bot) => {
                             ok(onProgress);
                         }
                     );
-                    msgs[name] = resp.responseRendered;
+                    msgs[name] = ctx.session.raw ? resp.response : resp.responseRendered;
                     tts[name] = resp.spokenText;
                 } catch (err) {
                     msgs[name] = `[ERROR] ${err?.message || err}`;

package/skills/cmd.mjs

@@ -8,15 +8,20 @@ const action = async (bot) => {
         ctx.session.ai || (ctx.session.ai = new Set());
         const curAi = new Set();
         ctx.cmd = ctx.text.split('\n')?.[0]?.replace(matchReg, '$1');
+        let catched;
+        switch (ctx.cmd) {
+            case 'raw': ctx.session.raw = true; catched = true; break;
+            case 'render': ctx.session.raw = false; catched = true; break;
+        }
         for (let name in bot.ai) {
             ctx.firstAi || (ctx.firstAi = name);
-            (utilitas.insensitiveCompare(ctx.cmd, name) || ctx.cmd === '*')
-                && curAi.add(name);
+            if (utilitas.insensitiveCompare(ctx.cmd, name) || ctx.cmd === '*') {
+                curAi.add(name);
+                catched = true;
+            }
         }
         curAi.size && (ctx.session.ai = curAi);
-        ctx.session.ai.size && (
-            ctx.text = ctx.text.replace(matchReg, '$2').trim() || bot.hello
-        );
+        catched && (ctx.text = ctx.text.replace(matchReg, '$2').trim() || bot.hello);
         await next();
     });
 };