feat: bug fixes and improvements

mrepol742 · mrepol742 · commit 8cffefaa35eb · 2025-09-26T21:40:18.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/src/commands/play.ts b/src/commands/play.ts
@@ -47,7 +47,7 @@ export default async function play(msg: Message) {
     return;
   }
 
-  await msg.react("✅");
+  await msg.react("🔍");
 
   const stream = await yt.download(audio.id, {
     type: "video+audio",
@@ -56,10 +56,15 @@ export default async function play(msg: Message) {
   });
 
   if (!stream) {
-    await msg.reply("Failed to download the audio stream.");
+    await Promise.all([
+      msg.reply("Failed to download the audio stream."),
+      msg.react(""),
+    ]);
     return;
   }
 
+  await msg.react("⬇️");
+
   const tempDir = "./.temp";
   await fs.promises.mkdir(tempDir, { recursive: true });
   const tempPath = path.join(tempDir, `${audio.id}.mp3`);
diff --git a/src/commands/top.ts b/src/commands/top.ts
@@ -24,11 +24,12 @@ export default async function (msg: Message) {
     \`Top Users by Activity:\`
 
     ${user
-      .filter((u, index) => u.commandCount !== 0 && index < 20)
+      .sort((a, b) => (b.totalActivity ?? 0) - (a.totalActivity ?? 0))
+      .slice(0, 30)
       .map((u, index) => {
         const displayName =
-          u.name.length > 12 ? u.name.slice(0, 12) + "..." : u.name;
-        return `${index + 1}. ${displayName}: ${u.commandCount + u.quizAnswered} Points`;
+          u.name.length > 9 ? u.name.slice(0, 9) + ".." : u.name;
+        return `${index + 1}. ${displayName}: ${u.totalActivity} Points`;
       })
       .join("\n    ")}
     `;
diff --git a/src/commands/video.ts b/src/commands/video.ts
@@ -49,7 +49,7 @@ export default async function (msg: Message) {
     return;
   }
 
-  await msg.react("✅");
+  await msg.react("🔍");
 
   const stream = await yt.download(video.video_id, {
     type: "video+audio",
@@ -62,6 +62,8 @@ export default async function (msg: Message) {
     return;
   }
 
+  await msg.react("⬇️");
+
   const tempDir = "./.temp";
   await fs.promises.mkdir(tempDir, { recursive: true });
   const tempPath = path.join(tempDir, `${video.video_id}.mp4`);
diff --git a/src/components/events/call.ts b/src/components/events/call.ts
@@ -24,24 +24,22 @@ export default async function (call: Call) {
   try {
     if (call.fromMe) return;
 
-    if (call.timestamp < Date.now() / 1000 - 60) {
-      await call.reject();
-      if (!call.from) return;
-
-      let response;
-      if (call.isVideo) {
-        response = getRandomResponse(videoResponses);
-      } else {
-        response = getRandomResponse(voiceResponses);
-      }
-
-      await client.sendMessage(call.from, response);
-
-      log.info(
-        "CallEvent",
-        `Rejected a ${call.isVideo ? "video" : "voice"} call from ${call.from}`,
-      );
+    await call.reject();
+    if (!call.from) return;
+
+    let response;
+    if (call.isVideo) {
+      response = getRandomResponse(videoResponses);
+    } else {
+      response = getRandomResponse(voiceResponses);
     }
+
+    await client.sendMessage(call.from, response);
+
+    log.info(
+      "CallEvent",
+      `Rejected a ${call.isVideo ? "video" : "voice"} call from ${call.from}`,
+    );
   } catch (err) {
     log.error("Error handling call:", err);
   }
diff --git a/src/components/events/edit.ts b/src/components/events/edit.ts
@@ -13,10 +13,11 @@ export default async function (
   prevBody: string,
 ) {
   if (msg.fromMe) return;
+  const lid = (msg.author ?? msg.from).split("@")[0];
   // const isGroup = !!msg.author;
   // const user = await getUserbyLid(msg.from) || "Your";
   //
-  log.info("EditMessage", prevBody);
+  log.info("EditMessage", lid, prevBody);
   await addMessage(msg, prevBody, "edit");
   // await msg.reply(
   //   `${isGroup ? user : "Your"} message was edited from "${prevBody}".`
diff --git a/src/components/events/groups/join.ts b/src/components/events/groups/join.ts
@@ -11,6 +11,15 @@ export default async function (notif: GroupNotification) {
     if (notif.timestamp < Date.now() / 1000 - 10) return;
     const group = await notif.getChat();
     const recipients = await notif.getRecipients();
+    const text = `
+      🙋‍♂️ 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\`.
+    `;
 
     const newMembers = [];
 
@@ -21,16 +30,7 @@ export default async function (notif: GroupNotification) {
       log.info("GroupJoin", `${name} joined the group ${group.name}`);
 
       if (isSelf) {
-        await notif.reply(
-          `🙋‍♂️ 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\`.
-        `,
-        );
+        await notif.reply(text);
       } else {
         newMembers.push(name);
       }
diff --git a/src/components/events/message.ts b/src/components/events/message.ts
@@ -39,14 +39,7 @@ export default async function (msg: Message, type: string) {
   // ignore message if it is older than 10 seconds
   if (msg.timestamp < Date.now() / 1000 - 10 && type === "create") return;
 
-  if (
-    // (msg.hasQuotedMsg && !msg.fromMe) ||
-    msg.isForwarded ||
-    msg.isGif ||
-    msg.isStatus ||
-    msg.broadcast
-  )
-    return; // ignore them all
+  if (msg.isGif || msg.isStatus || msg.broadcast) return; // ignore them all
 
   // process normalization
   msg.body = msg.body
@@ -74,6 +67,8 @@ export default async function (msg: Message, type: string) {
     await msg.reply(text);
   });
 
+  if (msg.isForwarded) return;
+
   /*
    *
    * Quiz command validation
@@ -109,7 +104,7 @@ export default async function (msg: Message, type: string) {
 
     await sleep(randomMs);
     const isEmoji = /.*[A-Za-z0-9].*/.test(reaction);
-    log.info("AutoReact", reaction);
+    log.info("AutoReact", lid, reaction);
 
     if (Math.random() < 0.1 && !isEmoji)
       if (Math.random() < 0.2)
@@ -251,6 +246,8 @@ export default async function (msg: Message, type: string) {
       handler.exec(msg),
 
       (async () => {
+        if (!msg.author) return;
+
         const user = await findOrCreateUser(msg);
 
         if (user) {
diff --git a/src/components/events/reaction.ts b/src/components/events/reaction.ts
@@ -18,7 +18,7 @@ export default async function (client: Client, react: Reaction) {
     if (!message) return;
     await sleep(2000);
     await message.react(react.reaction);
-    log.info("Reaction", `Reacted to message with ${react.reaction}`);
+    log.info("Reaction", senderId, `Reacted to message with ${react.reaction}`);
   } catch (error) {
     log.error("Failed to react back to message:", error);
   }
diff --git a/src/components/events/revoke.ts b/src/components/events/revoke.ts
@@ -9,10 +9,10 @@ import log from "../utils/log";
  */
 export default async function (msg: Message, revoked_msg?: Message) {
   if (msg.fromMe || !revoked_msg) return;
-  if (msg.timestamp < Date.now() / 1000 - 10) return;
+  const lid = (msg.author ?? msg.from).split("@")[0];
   // const isGroup = !!msg.author;
   // const user = (await getUserbyLid(msg.from)) || "Your";
-  log.info("RevokeMessage", revoked_msg?.body);
+  log.info("RevokeMessage", lid, revoked_msg?.body);
   await addMessage(msg, revoked_msg?.body, "revoke");
   // await msg.reply(
   //   `${isGroup ? user : "Your"} message "${revoked_msg?.body}" was deleted.`
diff --git a/src/components/services/log.ts b/src/components/services/log.ts
@@ -17,7 +17,8 @@ export default async function (
   output?: string
 ): Promise<void> {
   try {
-    const lid = msg.id.remote.split("@")[0];
+    const lid = (msg.author ?? msg.from).split("@")[0];
+
     await prisma.log.create({
       data: {
         lid,
diff --git a/src/components/services/message.ts b/src/components/services/message.ts
@@ -19,7 +19,8 @@ export async function addMessage(
   if (!body) return;
 
   try {
-    const lid = msg.id.remote.split("@")[0];
+    const lid = (msg.author ?? msg.from).split("@")[0];
+
     await prisma.message.create({
       data: {
         lid,
diff --git a/src/components/services/quiz.ts b/src/components/services/quiz.ts
@@ -4,7 +4,8 @@ import { Message } from "whatsapp-web.js";
 
 export async function newQuizAttempt(msg: Message, qid: string): Promise<void> {
   try {
-    const lid = msg.id.remote.split("@")[0];
+    const lid = (msg.author ?? msg.from).split("@")[0];
+
     await prisma.quiz.create({
       data: {
         mid: msg.id.id,
@@ -38,6 +39,7 @@ export async function setQuizAttemptAnswered(
 ): Promise<void> {
   try {
     if (!quoted.id || !quoted.id.remote) return;
+    const lid = (msg.author ?? msg.from).split("@")[0];
 
     await Promise.all([
       prisma.quiz.update({
@@ -46,7 +48,7 @@ export async function setQuizAttemptAnswered(
       }),
       prisma.user.update({
         where: {
-          lid: msg.author ? msg.author.split("@")[0] : msg.from.split("@")[0],
+          lid,
         },
         data: {
           quizAnswered: {
diff --git a/src/components/services/user.ts b/src/components/services/user.ts
@@ -13,47 +13,36 @@ function filterContent(body: string): string {
 
 export async function findOrCreateUser(msg: Message): Promise<boolean> {
   try {
-    const jid = msg.author || msg.from;
-    const lid = jid.split("@")[0];
+    const lid = (msg.author ?? msg.from).split("@")[0];
 
-    let user = await prisma.user.findUnique({
-      where: { lid },
-    });
-
-    if (user) {
-      await prisma.user.update({
+    const user = await prisma.user
+      .update({
         where: { lid },
-        data: {
-          commandCount: {
-            increment: 1,
-          },
-        },
-      });
-      return false;
-    }
-
-    try {
-      const contact = await msg.getContact();
-      const countryCode = await contact.getCountryCode();
-      const about = await contact.getAbout();
-      const name = contact.pushname || contact.name || "Unknown";
-
-      user = await prisma.user.create({
-        data: {
-          lid,
-          name,
-          number: contact.number,
-          countryCode,
-          type: contact.isBusiness ? "business" : "private",
-          mode: msg.author ? "group" : "private",
-          about: about ? filterContent(about) : "",
-          commandCount: 1,
-        },
-      });
-    } catch (err) {
-      log.error("Database", `Could not fetch contact for JID: ${jid}`);
-      return false;
-    }
+        data: { commandCount: { increment: 1 } },
+      })
+      .catch(() => null);
+
+    if (user) return false;
+
+    const contact = await msg.getContact();
+    if (!contact) return true;
+
+    const countryCode = await contact.getCountryCode();
+    const about = await contact.getAbout();
+    const name = contact.pushname || contact.name || "Unknown";
+
+    await prisma.user.create({
+      data: {
+        lid,
+        name,
+        number: contact.number,
+        countryCode,
+        type: contact.isBusiness ? "business" : "private",
+        mode: msg.author ? "group" : "private",
+        about: about ? filterContent(about) : "",
+        commandCount: 1,
+      },
+    });
   } catch (error) {
     log.error("Database", `Failed to find or create user.`, error);
   }
@@ -128,8 +117,7 @@ export async function getUsers(): Promise<any[]> {
     return users.map((u) => ({
       name: u.name,
       number: u.number,
-      commandCount: u._sum.commandCount,
-      quizAnswered: u._sum.quizAnswered,
+      totalActivity: (u._sum.commandCount ?? 0) + (u._sum.quizAnswered ?? 0),
     }));
   } catch (error) {
     log.error("Database", `Failed to get users.`, error);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export default async function (msg: Message) {`
`49`	`49`	`return;`
`50`	`50`	`}`
`51`	`51`
`52`		`- await msg.react("✅");`
	`52`	`+ await msg.react("🔍");`
`53`	`53`
`54`	`54`	`const stream = await yt.download(video.video_id, {`
`55`	`55`	`type: "video+audio",`
`@@ -62,6 +62,8 @@ export default async function (msg: Message) {`
`62`	`62`	`return;`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ await msg.react("⬇️");`
	`66`	`+`
`65`	`67`	`const tempDir = "./.temp";`
`66`	`68`	`await fs.promises.mkdir(tempDir, { recursive: true });`
`67`	`69`	const tempPath = path.join(tempDir, `${video.video_id}.mp4`);
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ export default async function (client: Client, react: Reaction) {`
`18`	`18`	`if (!message) return;`
`19`	`19`	`await sleep(2000);`
`20`	`20`	`await message.react(react.reaction);`
`21`		- log.info("Reaction", `Reacted to message with ${react.reaction}`);
	`21`	+ log.info("Reaction", senderId, `Reacted to message with ${react.reaction}`);
`22`	`22`	`} catch (error) {`
`23`	`23`	`log.error("Failed to react back to message:", error);`
`24`	`24`	`}`