halbot 1995.1.9 → 1995.1.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another AI powered Telegram bot, which is simple design, easy to use, extendable and fun.",
-  "version": "1995.1.9",
+  "version": "1995.1.11",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",

package/pipeline/010_broca.mjs

@@ -141,6 +141,11 @@ const ctxExt = ctx => {
             if (lastMsgId && pageMap[lastMsgId]?.raw === pages[i]) {
                 continue;
             }
+            if (!options?.processing && !_extra?.buttons?.length
+                && !_extra.keyboards && !lastMsgId && ctx.getKeyboard) {
+                delete _extra?.buttons;
+                _extra.keyboards = ctx.getKeyboard();
+            }
             await (lastMsgId ? ctx.edit(lastMsgId, pages[i], _extra) // ongoing, edit
                 : ctx.resp(pages[i], _extra));                       // new page, reply
             await ctx.timeout();
@@ -195,10 +200,14 @@ const action = async (ctx, next) => {
             + ctx._.message.new_chat_member.user.id + ' => '
             + ctx._.message.new_chat_member.status
         );
-        if (ctx._.message.new_chat_member.user.id !== ctx.botInfo.id
-            || ctx._.message.new_chat_member.status === 'left') {
+        if (ctx._.message.new_chat_member.user.id === ctx.botInfo.id
+            && ctx._.message.new_chat_member.status === 'left') {
             return ctx.finish();
-        } else { ctx.hello(); }
+        } else if (ctx._.message.new_chat_member.user.id === ctx.botInfo.id) {
+            ctx.hello();
+        }
+    } else if (ctx._.message.group_chat_created) {
+        return ctx.finish();
     } else if (!ctx._.type) { return log(`Unsupported message type.`); }
     // get chat metadata
     ctx._.chatId = ctx._.message.chat.id;

package/pipeline/020_cmd.mjs

@@ -6,24 +6,22 @@ const log = (c, o) => utilitas.log(c, _name, { time: 1, ...o || {} });
 
 // https://stackoverflow.com/questions/69924954/an-error-is-issued-when-opening-the-telebot-keyboard
 const keyboards = [[
-    { text: `/ai ${bot.BOT}` },
-    { text: '/help 🛟' },
+    { text: `/ai ${bot.BOT}` }, { text: '/help 🛟' },
 ], [
-    { text: '/set --tts=🔊' },
-    { text: '/set --tts=🔇' },
-], [
-    { text: '/set --chatty=🐵' },
-    { text: '/set --chatty=🙊' },
+    { text: '/set --tts=🔊' }, { text: '/set --tts=🔇' },
 ]];
 
+const getKeyboard = ctx => ctx._.chatType === hal.GROUP ? [
+    ...keyboards, [{ text: '/set --chatty=🐵' }, { text: '/set --chatty=🙊' }]
+] : keyboards;
+
+const ctxExt = ctx => {
+    ctx.getKeyboard = () => getKeyboard(ctx);
+};
+
 const action = async (ctx, next) => {
-    // reload functions
-    const _ok = ctx.ok;
-    // @TODO: this will case keyboard showup everytime
-    // ctx.ok = async (message, options) => await _ok(message, {
-    //     ...options || {},
-    //     ...options?.buttons ? {} : (options?.keyboards || { keyboards }),
-    // });
+    // extend ctx
+    ctxExt(ctx);
     // handle callback query
     if (ctx._.type === 'callback_query') {
         const data = utilitas.parseJson(ctx.update.callback_query.data);
@@ -64,7 +62,7 @@ const action = async (ctx, next) => {
             = { args: ctx._.cmd.args, touchedAt: Date.now() };
     }
     // handle commands
-    switch (ctx.cmd?.cmd) {
+    switch (ctx._.cmd?.cmd) {
         case 'clearkb':
             return await ctx.complete({ keyboards: [] });
     }

package/pipeline/060_config.mjs

@@ -49,7 +49,7 @@ const action = async (ctx, next) => {
             }
         case 'reset':
             ctx._.session.config = ctx._.config = {};
-            return await ctx.complete();
+            return await ctx.complete({ keyboards: ctx.getKeyboard() });
     }
     await next();
 };

package/pipeline/100_chat.mjs

@@ -8,11 +8,10 @@ const action = async (ctx, next) => {
     let [resp, extra, lock, sResp, lastMsg, lastSent] =
         [null, { buttons: [] }, 1000 * 3, null, null, 0];
     const ok = async options => {
-        const curTime = Date.now();
         if (options?.processing && (
-            curTime - lastSent < ctx._.limit || lastMsg === resp.text
+            Date.now() - lastSent < ctx._.limit || lastMsg === resp.text
         )) { return; }
-        [lastSent, lastMsg] = [curTime + lock, resp.text];
+        [lastSent, lastMsg] = [Date.now() + lock, resp.text];
         if (!options?.processing) {
             (resp.annotations || []).map((x, i) => extra.buttons.push({
                 label: `${i + 1}. ${x.title}`, url: x.url,
@@ -22,7 +21,7 @@ const action = async (ctx, next) => {
             ...ctx._.keyboards ? { keyboards: ctx._.keyboards } : {},
             ...extra, ...options || {},
         });
-        lastSent = curTime;
+        lastSent = Date.now();
         return sResp;
     };
     resp = await alan.talk(ctx._.text, {
@@ -43,8 +42,8 @@ const action = async (ctx, next) => {
     }
     // print(resp);
     await ctx.timeout();
-    await resp.text.trim() ? ok({ processing: false })
-        : ctx.deleteMessage(ctx._.done[0].message_id);
+    await (resp.text.trim() ? ok({ processing: false })
+        : ctx.deleteMessage(ctx._.done[0].message_id));
     ctx._.request = resp.request;
     ctx._.response = resp.response;
     ctx.memorize && await ctx.memorize();