utilitas 1995.3.11 → 1995.3.13

package/lib/bot.mjs

@@ -230,14 +230,18 @@ const newCommand = (command, description) => ({
 const reply = async (ctx, md, text, extra) => {
     try {
         if (md) {
-            return await ctx.replyWithMarkdown(text, extra);
+            return await (extra?.reply_to_message_id
+                ? ctx.replyWithMarkdown(text, { ...extra, parse_mode: 'Markdown' })
+                : ctx.sendMessage(text, { ...extra, parse_mode: 'Markdown' }));
         }
     } catch (err) {
         assert(isMarkdownError(err), err, 500);
         await ctx.timeout();
     }
     return await ignoreErrFunc(
-        async () => await ctx.reply(text, extra), logOptions
+        async () => await (extra?.reply_to_message_id
+            ? ctx.reply(text, extra) : ctx.sendMessage(text, extra)
+        ), logOptions
     );
 };
 
@@ -262,7 +266,7 @@ const editMessageText = async (ctx, md, lastMsgId, text, extra) => {
 const memorize = async (ctx) => {
     if (ctx._skipMemorize) { return; }
     const received = ctx.update;
-    const received_text = ctx.text;
+    const received_text = ctx.txt;
     const id = received.update_id;
     const response = lastItem(ctx.done.filter(x => x.text)) || {};
     const response_text = response?.text || '';
@@ -309,7 +313,7 @@ const subconscious = [{
         };
         ctx.collect = (content, type) => type ? ctx.collected.push(
             { type, content }
-        ) : (ctx.text = content);
+        ) : (ctx.txt = content);
         ctx.skipMemorize = () => ctx._skipMemorize = true;
         ctx.ok = async (message, options) => {
             let pages = paging(message);
@@ -384,30 +388,33 @@ const subconscious = [{
 }, {
     run: true, priority: -8950, name: 'subconscious', func: async (ctx, next) => {
         for (let t of KNOWN_UPDATE_TYPES) {
-            if (ctx.update[t]) { ctx.msg = ctx.update[ctx.type = t]; break; }
+            if (ctx.update[t]) {
+                ctx.m = ctx.update[ctx.type = t];
+                break;
+            }
         }
-        if (ctx.type === 'callback_query') { ctx.msg = ctx.msg.message; }
+        if (ctx.type === 'callback_query') { ctx.m = ctx.msg.message; }
         else if (ctx.type === 'my_chat_member') {
             log(
                 'Group member status changed: '
-                + ctx.msg.new_chat_member.user.id + ' => '
-                + ctx.msg.new_chat_member.status
+                + ctx.m.new_chat_member.user.id + ' => '
+                + ctx.m.new_chat_member.status
             );
-            if (ctx.msg.new_chat_member.user.id !== ctx.botInfo.id
-                || ctx.msg.new_chat_member.status === 'left') { return }
+            if (ctx.m.new_chat_member.user.id !== ctx.botInfo.id
+                || ctx.m.new_chat_member.status === 'left') { return }
             else { ctx.hello(); }
         } else if (!ctx.type) { return log(`Unsupported update type.`); }
         ctx._ = bot._;
-        ctx.chatId = ctx.msg.chat.id;
-        ctx.chatType = ctx.msg.chat.type;
-        ctx.messageId = ctx.msg.message_id;
-        ctx.msg.text && ctx.collect(ctx.msg.text);
+        ctx.chatId = ctx.m.chat.id;
+        ctx.chatType = ctx.m.chat.type;
+        ctx.messageId = ctx.m.message_id;
+        ctx.m.text && ctx.collect(ctx.m.text);
         ctx.session = await sessionGet(ctx.chatId);
         ctx.limit = ctx.chatType === PRIVATE ? PRIVATE_LIMIT : GROUP_LIMIT;
         ctx.entities = [
-            ...(ctx.msg.entities || []).map(e => ({ ...e, text: ctx.msg.text })),
-            ...(ctx.msg.caption_entities || []).map(e => ({ ...e, text: ctx.msg.caption })),
-            ...(ctx.msg.reply_to_message?.entities || []).map(e => ({ ...e, text: ctx.msg.reply_to_message.text })),
+            ...(ctx.m.entities || []).map(e => ({ ...e, text: ctx.m.text })),
+            ...(ctx.m.caption_entities || []).map(e => ({ ...e, text: ctx.m.caption })),
+            ...(ctx.m.reply_to_message?.entities || []).map(e => ({ ...e, text: ctx.m.reply_to_message.text })),
         ].map(e => ({
             ...e, matched: e.text.substring(e.offset, e.offset + e.length),
             ...e.type === 'text_link' ? { type: 'url', matched: e.url } : {},
@@ -419,16 +426,39 @@ const subconscious = [{
                 case bot_command: target = e.matched.split('@')[1]; break;
             }
             return target === ctx.botInfo.username;
-        }) || ctx.msg.reply_to_message?.from?.username === ctx.botInfo.username)
+        }) || ctx.m.reply_to_message?.from?.username === ctx.botInfo.username)
             && (ctx.chatType = MENTION);
-        if ((ctx.text || ctx.msg.voice || ctx.msg.poll || ctx.msg.data
-            || ctx.msg.document || ctx.msg.photo) && ctx.messageId) {
+        if ((ctx.txt || ctx.m.voice || ctx.m.poll || ctx.m.data
+            || ctx.m.document || ctx.m.photo) && ctx.messageId) {
             await next();
         }
         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':
@@ -488,10 +518,10 @@ 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.text)) {     // auth by magicWord
+        if (ctx._.magicWord && insensitiveHas(ctx._.magicWord, ctx.txt)) {      // auth by magicWord
             ctx._.private.add(String(ctx.chatId));
             await ctx.ok('😸 You are now allowed to talk to me.');
             ctx.hello();
@@ -515,11 +545,11 @@ 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) => {
-        if (ctx._.speech?.stt && ctx.msg.voice?.mime_type === 'audio/ogg') {
+    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 {
-                const file = await getFile(ctx.msg.voice.file_id, BUFFER_ENCODE);
+                const file = await getFile(ctx.m.voice.file_id, BUFFER_ENCODE);
                 const resp = await ignoreErrFunc(
                     async () => await ctx._.speech?.stt(file), logOptions
                 ) || ' ';
@@ -530,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];
@@ -539,29 +569,29 @@ const subconscious = [{
                 ctx.collect(cb.text);
             } else {
                 return await ctx.er(
-                    `Command is invalid or expired: ${ctx.msg.data}`
+                    `Command is invalid or expired: ${ctx.m.data}`
                 );
             }
         }
         await next();
     },
 }, {
-    run: true, priority: -8900, name: 'poll', func: async (ctx, next) => {
-        ctx.msg.poll && ctx.collect(lines([
-            'Question:', ctx.msg.poll.question, '',
-            'Options:', oList(ctx.msg.poll.options.map(x => x.text)),
+    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)),
         ]));
         await next();
     },
 }, {
-    run: true, priority: -8890, name: 'contaxt', func: async (ctx, next) => {
-        ctx.msg.reply_to_message?.text && ctx.collect(
-            ctx.msg.reply_to_message.text, 'CONTAXT'
+    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) {
@@ -575,37 +605,37 @@ 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.msg.document?.mime_type) {
+        if ('application/pdf' === ctx.m.document?.mime_type) {
             ocrFunc = ctx._.vision?.read;
-            fileId = ctx.msg.document.file_id;
-            file_name = ctx.msg.document.file_name;
-            mime_type = ctx.msg.document.mime_type;
+            fileId = ctx.m.document.file_id;
+            file_name = ctx.m.document.file_name;
+            mime_type = ctx.m.document.mime_type;
             type = 'DOCUMENT';
-        } else if (/^image\/.*$/ig.test(ctx.msg.document?.mime_type)) {
-            asPrompt = bot._.supportedMimeTypes.has(ctx.msg.document.mime_type);
+        } else if (/^image\/.*$/ig.test(ctx.m.document?.mime_type)) {
+            asPrompt = bot._.supportedMimeTypes.has(ctx.m.document.mime_type);
             ocrFunc = ctx._.vision?.see;
-            fileId = ctx.msg.document.file_id;
-            file_name = ctx.msg.document.file_name;
-            mime_type = ctx.msg.document.mime_type;
+            fileId = ctx.m.document.file_id;
+            file_name = ctx.m.document.file_name;
+            mime_type = ctx.m.document.mime_type;
             type = 'IMAGE';
-        } else if (/^.*\.(docx|xlsx|pptx)$/.test(ctx.msg.document?.file_name)) {
+        } else if (/^.*\.(docx|xlsx|pptx)$/.test(ctx.m.document?.file_name)) {
             ocrFunc = officeParser;
-            fileId = ctx.msg.document.file_id;
-            file_name = ctx.msg.document.file_name;
-            mime_type = ctx.msg.document.mime_type;
+            fileId = ctx.m.document.file_id;
+            file_name = ctx.m.document.file_name;
+            mime_type = ctx.m.document.mime_type;
             type = 'DOCUMENT';
-        } else if (ctx.msg.document) {
+        } else if (ctx.m.document) {
             ocrFunc = async file => (await isTextFile(file)) && file.toString();
-            fileId = ctx.msg.document.file_id;
-            file_name = ctx.msg.document.file_name;
-            mime_type = ctx.msg.document.mime_type;
+            fileId = ctx.m.document.file_id;
+            file_name = ctx.m.document.file_name;
+            mime_type = ctx.m.document.mime_type;
             type = 'FILE';
-        } else if (ctx.msg.photo) {
+        } else if (ctx.m.photo) {
             asPrompt = true;
             ocrFunc = ctx._.vision?.see;
-            fileId = ctx.msg.photo[ctx.msg.photo.length - 1]?.file_id;
+            fileId = ctx.m.photo[ctx.m.photo.length - 1]?.file_id;
             mime_type = 'image';
             type = 'PHOTO';
         }
@@ -615,7 +645,7 @@ const subconscious = [{
                 const image_url = await getFileUrl(fileId);
                 const file = (await get(image_url, BUFFER_ENCODE)).content;
                 if (asPrompt) {
-                    ctx.collect(ctx.msg.caption || '');
+                    ctx.collect(ctx.m.caption || '');
                     ctx.collect({
                         mime_type: mime_type === 'image' ? 'image/jpeg' : mime_type,
                         image_url, data: base64Encode(file, true),
@@ -628,7 +658,7 @@ const subconscious = [{
                         ), logOptions)
                     ).filter(x => x).join('\n'));
                     if (content) {
-                        ctx.collect(ctx.msg.caption || '');
+                        ctx.collect(ctx.m.caption || '');
                         ctx.collect(lines([
                             '---', ...file_name ? [`file_name: ${file_name}`] : [],
                             `mime_type: ${mime_type}`, `type: ${type}`, '---',
@@ -640,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.text || '', ctx.msg.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.11",
+    "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.11",
+    "version": "1995.3.13",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",