utilitas 1995.3.12 → 1995.3.13

package/lib/bot.mjs

@@ -231,8 +231,8 @@ const reply = async (ctx, md, text, extra) => {
     try {
         if (md) {
             return await (extra?.reply_to_message_id
-                ? ctx.replyWithMarkdown(text, extra)
-                : ctx.sendMessage(text, extra));
+                ? ctx.replyWithMarkdown(text, { ...extra, parse_mode: 'Markdown' })
+                : ctx.sendMessage(text, { ...extra, parse_mode: 'Markdown' }));
         }
     } catch (err) {
         assert(isMarkdownError(err), err, 500);
@@ -435,7 +435,30 @@ const subconscious = [{
         await sessionSet(ctx.chatId);
     },
 }, {
-    run: true, priority: -8940, name: 'echo', hidden: true, func: async (ctx, next) => {
+    run: true, priority: -8940, name: 'commands', func: async (ctx, next) => {
+        for (let e of ctx.entities) {
+            if (e.type !== bot_command) { continue; }
+            if (!COMMAND_REGEXP.test(e.matched)) { continue; }
+            const cmd = trim(e.matched.replace(
+                COMMAND_REGEXP, '$1'
+            ), { case: 'LOW' });
+            ctx.cmd = { cmd, args: e.text.substring(e.offset + e.length + 1) };
+            break;
+        }
+        for (let str of [ctx.txt || '', ctx.m.caption || ''].map(trim)) {
+            if (!ctx.cmd && COMMAND_REGEXP.test(str)) {
+                ctx.cmd = { // this will faild if command includes urls
+                    cmd: str.replace(COMMAND_REGEXP, '$1').toLowerCase(),
+                    args: str.replace(COMMAND_REGEXP, '$4'),
+                };
+                break;
+            }
+        }
+        ctx.cmd && log(`Command: ${JSON.stringify(ctx.cmd)}`);
+        await next();
+    },
+}, {
+    run: true, priority: -8930, name: 'echo', hidden: true, func: async (ctx, next) => {
         let resp, md = false;
         switch (ctx.cmd.cmd) {
             case 'echo':
@@ -495,7 +518,7 @@ const subconscious = [{
         lorem: '[Lorem ipsum](https://en.wikipedia.org/wiki/Lorem_ipsum)',
     },
 }, {
-    run: true, priority: -8930, name: 'authenticate', func: async (ctx, next) => {
+    run: true, priority: -8920, name: 'authenticate', func: async (ctx, next) => {
         if (!await ctx.shouldReply()) { return; }                               // if chatType is not in whitelist, exit.
         if (!ctx._.private) { return await next(); }                            // if not private, go next.
         if (ctx._.magicWord && insensitiveHas(ctx._.magicWord, ctx.txt)) {      // auth by magicWord
@@ -522,7 +545,7 @@ const subconscious = [{
         await ctx.ok('😿 Sorry, I am not allowed to talk to strangers.');
     },
 }, {
-    run: true, priority: -8920, name: 'speech-to-text', func: async (ctx, next) => {
+    run: true, priority: -8910, name: 'speech-to-text', func: async (ctx, next) => {
         if (ctx._.speech?.stt && ctx.m.voice?.mime_type === 'audio/ogg') {
             await ctx.ok(EMOJI_SPEECH);
             try {
@@ -537,7 +560,7 @@ const subconscious = [{
         await next();
     },
 }, {
-    run: true, priority: -8910, name: 'callback', func: async (ctx, next) => {
+    run: true, priority: -8900, name: 'callback', func: async (ctx, next) => {
         if (ctx.type === 'callback_query') {
             const data = parseJson(ctx.update[ctx.type].data);
             const cb = ctx.session.callback.filter(x => x.id == data?.callback)[0];
@@ -553,7 +576,7 @@ const subconscious = [{
         await next();
     },
 }, {
-    run: true, priority: -8900, name: 'poll', func: async (ctx, next) => {
+    run: true, priority: -8890, name: 'poll', func: async (ctx, next) => {
         ctx.m.poll && ctx.collect(lines([
             'Question:', ctx.m.poll.question, '',
             'Options:', oList(ctx.m.poll.options.map(x => x.text)),
@@ -561,14 +584,14 @@ const subconscious = [{
         await next();
     },
 }, {
-    run: true, priority: -8890, name: 'contaxt', func: async (ctx, next) => {
+    run: true, priority: -8880, name: 'contaxt', func: async (ctx, next) => {
         ctx.m.reply_to_message?.text && ctx.collect(
             ctx.m.reply_to_message.text, 'CONTAXT'
         );
         await next();
     },
 }, {
-    run: true, priority: -8880, name: 'web', func: async (ctx, next) => {
+    run: true, priority: -8870, name: 'web', func: async (ctx, next) => {
         if (ctx.entities.some(e => e.type === 'url')) {
             await ctx.ok(EMOJI_LOOK);
             for (let e of ctx.entities) {
@@ -582,7 +605,7 @@ const subconscious = [{
         await next();
     },
 }, {
-    run: true, priority: -8870, name: 'vision', func: async (ctx, next) => {
+    run: true, priority: -8860, name: 'vision', func: async (ctx, next) => {
         let fileId, type, file_name, mime_type, ocrFunc, asPrompt = false;
         if ('application/pdf' === ctx.m.document?.mime_type) {
             ocrFunc = ctx._.vision?.read;
@@ -647,29 +670,6 @@ const subconscious = [{
         }
         await next();
     },
-}, {
-    run: true, priority: -8860, name: 'commands', func: async (ctx, next) => {
-        for (let e of ctx.entities) {
-            if (e.type !== bot_command) { continue; }
-            if (!COMMAND_REGEXP.test(e.matched)) { continue; }
-            const cmd = trim(e.matched.replace(
-                COMMAND_REGEXP, '$1'
-            ), { case: 'LOW' });
-            ctx.cmd = { cmd, args: e.text.substring(e.offset + e.length + 1) };
-            break;
-        }
-        for (let str of [ctx.txt || '', ctx.m.caption || ''].map(trim)) {
-            if (!ctx.cmd && COMMAND_REGEXP.test(str)) {
-                ctx.cmd = { // this will faild if command includes urls
-                    cmd: str.replace(COMMAND_REGEXP, '$1').toLowerCase(),
-                    args: str.replace(COMMAND_REGEXP, '$4'),
-                };
-                break;
-            }
-        }
-        ctx.cmd && log(`Command: ${JSON.stringify(ctx.cmd)}`);
-        await next();
-    },
 }, {
     run: true, priority: -8850, name: 'help', func: async (ctx, next) => {
         const help = ctx._.info ? [ctx._.info] : [];

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.3.12",
+    "version": "1995.3.13",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1995.3.12",
+    "version": "1995.3.13",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",