feat: bug fixes and improvements

Author: mrepol742

src/commands/help.ts

@@ -1,12 +1,12 @@
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
 import log from "../components/utils/log";
 import { commands } from "../components/utils/cmd/loader";
 
 export const info = {
   command: "help",
   description: "List available commands and their usage.",
-  usage: "help [page] | [role]",
-  example: "help admin",
+  usage: "help [page] | [role] | [command]",
+  example: "help",
   role: "user",
   cooldown: 5000,
 };
@@ -26,10 +26,10 @@ function paginate(items: string[], page: number, pageSize: number): string[] {
 function buildUserPage(
   userCommands: string[],
   page: number,
-  totalPages: number
+  totalPages: number,
 ): string {
   let response = `
-  Use \`help <command>\` for more details on a specific command.\n
+  Use \`help [page] | [role] | [command]\` for more details on a specific command.\n
   < ─────────── >\n   •  ${userCommands.join("\n   •  ") || "_None_"}\n\n`;
   response += `< ─────────── >`;
   response += `\n\`Page ${page} of ${totalPages}\``;
@@ -38,7 +38,7 @@ function buildUserPage(
 
 function buildAdminPage(adminCommands: string[]): string {
   return `
-  Use \`help <command>\` for more details on a specific command.\n
+  Use \`help [page] | [role] | [command]\` for more details on a specific command.\n
   < ─────────── >\n   •  ${
     adminCommands.join("\n   •  ") || "_None_"
   }\n< ─────────── >
@@ -79,6 +79,11 @@ export default async function (msg: Message) {
     return;
   }
 
+  if (!/^[1-9]\d*$/.test(query)) {
+    await msg.reply("Please type a valid page number.");
+    return;
+  }
+
   // help [page]
   const match = query.match(/(\d+)?/i);
   const page = Math.max(1, match && match[1] ? parseInt(match[1], 10) : 1);

src/commands/stalk.ts

@@ -1,4 +1,5 @@
-import { Message } from "../../types/message"
+import { Message } from "../../types/message";
+import { getQuizCount } from "../components/services/quiz";
 import { getUserbyLid } from "../components/services/user";
 
 export const info = {
@@ -11,32 +12,15 @@ export const info = {
 };
 
 export default async function (msg: Message) {
-  if (msg.body.includes(" ") && msg.mentionedIds.length === 0) {
-    await msg.reply("Please mention a user to stalk.");
-    return;
-  }
-
   if (msg.mentionedIds.length === 0) {
-    const contact = await msg.getContact();
-    const countryCode = await contact.getCountryCode();
-    const about = await contact.getAbout();
-    const name = contact.pushname || contact.name || "Unknown";
-
-    const text = `
-    \`${name}\`
-    ${about || "No about information available."}
-
-    ID: ${contact.id.user}
-    Number: ${contact.number}
-    Country Code: ${countryCode}
-    Type: ${contact.isBusiness ? "Business" : "Personal"}
-    Mode: ${msg.author ? "group" : "private"}
-    `;
-    await msg.reply(text);
+    await msg.reply("Please mention a user to stalk.");
     return;
   }
 
-  const user = await getUserbyLid(msg.mentionedIds[0].split("@")[0]);
+  const lid = msg.mentionedIds[0].split("@")[0];
+  const [user] = await Promise.all([
+    getUserbyLid(lid)
+  ]);
   if (!user) return await msg.reply("User not found.");
 
   const text = `
@@ -49,6 +33,7 @@ export default async function (msg: Message) {
     Type: ${user.type}
     Mode: ${user.mode}
     Command Count: ${user.commandCount}
+    Last Seen: ${new Date(user.updatedAt).toLocaleString()}
     `;
   await msg.reply(text);
 }

src/components/events/groups/join.ts

@@ -11,22 +11,35 @@ export default async function (notif: GroupNotification) {
     const group = await notif.getChat();
     const recipients = await notif.getRecipients();
 
+    const newMembers = [];
+
     for (const contact of recipients) {
       const name = contact.pushname || contact.name || contact.id.user;
       const isSelf = contact.id._serialized === client.info.wid._serialized;
 
       await sleep(2000);
 
       log.info("Group Join", `${name} joined the group ${group.name}`);
+
       if (isSelf) {
         await notif.reply(
-          `🙋‍♂️ Hello everyone! I'm ${PROJECT_CANIS_ALIAS} your WhatsApp Bot,
-          for more information please send \`help\` or \`legal\.`,
+          `🙋‍♂️ Hello everyone!
+
+          I'm ${PROJECT_CANIS_ALIAS}, a scalable, modular and
+          flexible chatbot for WhatsApp and Telegram.
+
+          By continuing you agree to the bot \`terms\` and \`privacy\`.
+          To list down commands type \`help\`.
+        `,
         );
       } else {
-        await notif.reply(`👋 Welcome *${name}* 🎉`);
+        newMembers.push(name);
       }
     }
+
+    if (newMembers.length > 0) {
+      await notif.reply(`👋 Welcome *${newMembers.join(", ")}* 🎉`);
+    }
   } catch (err) {
     log.error("Group Join", "Failed to process group join event:", err);
   }

src/components/events/groups/leave.ts

@@ -8,11 +8,22 @@ export default async function (notif: GroupNotification) {
     const group = await notif.getChat();
     const recipients = await notif.getRecipients();
 
+    const leavers = [];
+
     for (const contact of recipients) {
       const name = contact.pushname || contact.name || contact.id.user;
       log.info("Group Leave", `${name} left the group ${group.name}`);
+
       await sleep(1500); // prevent flooding
-      await notif.reply(`👋 *${name}* has left. I’ll miss you!`);
+      leavers.push(name);
+    }
+
+    if (leavers.length > 0) {
+      await notif.reply(
+        leavers.length === 1
+          ? `👋 *${leavers[0]}* has left. I’ll miss you!`
+          : `👋 *${leavers.join(", ")}* have left. We’ll miss you all!`,
+      );
     }
   } catch (err) {
     log.error("Group Leave", "Failed to process group leave event:", err);

src/components/services/quiz.ts

@@ -34,7 +34,7 @@ export async function getQuizAttempts(msg: Message): Promise<any | null> {
 
 export async function setQuizAttemptAnswered(
   msg: Message,
-  quoted: Message
+  quoted: Message,
 ): Promise<void> {
   try {
     if (!quoted.id || !quoted.id.remote) return;
@@ -59,3 +59,23 @@ export async function setQuizAttemptAnswered(
     log.error("Database", `Failed to set quiz attempt as answered.`, error);
   }
 }
+
+export async function getQuizCount(
+  lid: string,
+): Promise<{ total: number; answered: number }> {
+  try {
+    const [total, answered] = await Promise.all([
+      prisma.quiz.count({
+        where: { lid },
+      }),
+      prisma.quiz.count({
+        where: { lid, answeredAt: { not: null } },
+      }),
+    ]);
+
+    return { total, answered };
+  } catch (error) {
+    log.error("Database", `Failed to get quiz counts.`, error);
+    return { total: 0, answered: 0 };
+  }
+}