feat: multiple bug fixes and improvements i cant even hold count of.

Author: mrepol742

src/commands/help.ts

@@ -1,6 +1,6 @@
 import { Message } from "../../types/message"
 import log from "../components/utils/log";
-import { commands } from "../index";
+import { commands } from "../components/utils/cmd/loader";
 
 export const info = {
   command: "help",
@@ -16,7 +16,7 @@ type CommandType = {
   role: string;
 };
 
-const PAGE_SIZE = 10;
+const PAGE_SIZE = 20;
 
 function paginate(items: string[], page: number, pageSize: number): string[] {
   const start = (page - 1) * pageSize;

src/commands/reload.ts

@@ -3,7 +3,7 @@ import axios from "../components/axios";
 import log from "../components/utils/log";
 import fs from "fs";
 import path from "path";
-import { commands, commandDirs } from "../index";
+import { commands, commandDirs } from "../components/utils/cmd/loader";
 import Loader from "../components/utils/cmd/loader";
 
 export const info = {
@@ -20,7 +20,7 @@ export default async function (msg: Message) {
 
   if (query.length !== 0) {
     if (!commands[query.toLocaleLowerCase()]) {
-      await msg.reply(`Command "${query}" not found.`);
+      await msg.reply(`Command \`${query}\` not found.`);
       return;
     }
 
@@ -34,20 +34,12 @@ export default async function (msg: Message) {
       }
     }
 
-    if (!found)
-      await msg.reply(
-        `
-    \`Failed to load\`
-    ${query}
-    `,
-      );
-    if (found)
-      await msg.reply(
-        `
-      \`Successfully reloaded\`
-      ${query}
-      `,
-      );
+    if (!found) {
+      await msg.reply(`\`Failed to load\`\n${query}`);
+    } else {
+      await msg.reply(`\`Successfully reloaded\`\n${query}`);
+    }
+
     return;
   }
 

src/commands/stats.ts

@@ -4,7 +4,7 @@ import os from "os";
 import si from "systeminformation";
 import { getUserCount, getBlockUserCount } from "../components/services/user";
 import { client } from "../components/client";
-import { commands } from "../index";
+import { commands } from "../components/utils/cmd/loader";
 
 export const info = {
   command: "stats",

src/commands/unload.ts

@@ -0,0 +1,55 @@
+import { Message } from "../../types/message";
+import { commands, commandDirs } from "../components/utils/cmd/loader";
+import Loader from "../components/utils/cmd/loader";
+import path from "path";
+
+export const info = {
+  command: "unload",
+  description: "Unload a specific command.",
+  usage: "unload [command]",
+  example: "unload ai",
+  role: "admin",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message) {
+  const query = msg.body.replace(/^unload\b\s*/i, "").trim().toLowerCase();
+
+  if (!query) {
+    await msg.reply("Please specify a command to unload.");
+    return;
+  }
+
+  if (!commands[query]) {
+    await msg.reply(`Command "${query}" not found.`);
+    return;
+  }
+
+  if (query === "unload") {
+    await msg.reply(
+      `"${query}" can't be un-unloaded, 'cause the command that unloads can't be unloaded when it unloads unloading!`
+    );
+    return;
+  }
+
+  const possibleExtensions = [".ts", ".js"];
+  let found = false;
+
+  for (const ext of possibleExtensions) {
+    for (const dir of commandDirs) {
+      const filePath = path.resolve(dir, `${query}${ext}`);
+      try {
+        delete require.cache[require.resolve(filePath)];
+        delete commands[query];
+        found = true;
+      } catch {
+      }
+    }
+  }
+
+  if (!found) {
+    await msg.reply(`\`Failed to unload\`\n${query}`);
+  } else {
+    await msg.reply(`\`Successfully unloaded\`\n${query}`);
+  }
+}

src/components/client.ts

@@ -7,7 +7,7 @@ import {
   Reaction,
 } from "whatsapp-web.js";
 import qrcode from "qrcode-terminal";
-import cliProgress from "cli-progress";
+import LoadingBar from "./utils/loadingBar";
 import messageEvent from "./events/message";
 import messageEdit from "./events/edit";
 import groupLeave from "./events/groups/leave";
@@ -16,15 +16,7 @@ import reaction from "./events/reaction";
 import ready from "./events/ready";
 import revoke from "./events/revoke";
 
-const loadingBar = new cliProgress.SingleBar(
-  {
-    format: "Loading | {bar} | {value}%",
-    barCompleteChar: "█",
-    barIncompleteChar: "-",
-    hideCursor: true,
-  },
-  cliProgress.Presets.shades_classic
-);
+const loadingBar = LoadingBar("Loading Client   | {bar} | {value}%");
 const client = new Client({
   puppeteer: {
     executablePath:
@@ -40,11 +32,13 @@ client.on("loading_screen", (percent: number, message: string) => {
     isLoadingBarStarted = true;
   }
 
+  if (percent >= 99) loadingBar.stop();
+
   loadingBar.update(percent, { message });
 });
 
 client.on("authenticated", () =>
-  log.info("Auth", "Client authenticated successfully.")
+  log.info("Auth", "Client authenticated successfully."),
 );
 
 client.on("qr", (qr: string) => {
@@ -53,34 +47,34 @@ client.on("qr", (qr: string) => {
   qrcode.generate(qr, { small: true });
 });
 
-client.on("ready", async () => {
-  loadingBar.stop();
-  ready();
-});
+client.on("ready", async () => ready());
 
 client.on("message_reaction", async (react: Reaction) =>
-  reaction(client, react)
+  reaction(client, react),
 );
 
 // client.on("message", (msg) => messageEvent(msg));
 client.on("message_create", async (msg: Message) => messageEvent(msg));
 
 client.on(
   "message_edit",
-  async (msg: Message, newBody: string, prevBody: string) =>
-    messageEdit(msg, newBody, prevBody)
+  async (msg: Message, newBody: string, prevBody: string) => {
+    msg.body = newBody;
+    await Promise.all([messageEdit(msg, newBody, prevBody), messageEvent(msg)]);
+  },
 );
 
 client.on(
   "message_revoke_everyone",
-  async (msg: Message, revoked_msg?: Message) => revoke(msg, revoked_msg)
+  async (msg: Message, revoked_msg?: Message) => revoke(msg, revoked_msg),
 );
 
 client.on("group_join", async (notif: GroupNotification) => groupJoin(notif));
 client.on("group_leave", async (notif: GroupNotification) => groupLeave(notif));
-client.on("auth_failure", (msg: string) =>
-  log.error("Auth", "Authentication failed. Please try again.")
-);
+client.on("auth_failure", (msg: string) => {
+  loadingBar.stop();
+  log.error("Auth", "Authentication failed. Please try again.");
+});
 
 client.initialize();
 

src/components/events/edit.ts

@@ -11,11 +11,9 @@ export default async function (
   _newBody: string,
   prevBody: string,
 ) {
-  if (msg.fromMe || msg.timestamp < Date.now() / 1000 - 10) return;
-
   // const isGroup = !!msg.author;
   // const user = await getUserbyLid(msg.from) || "Your";
-  if (prevBody) await addMessage(msg, prevBody, "edit");
+  await addMessage(msg, prevBody, "edit");
   // await msg.reply(
   //   `${isGroup ? user : "Your"} message was edited from "${prevBody}".`
   // );

src/components/events/groups/join.ts

@@ -1,6 +1,9 @@
 import { GroupNotification } from "whatsapp-web.js";
 import log from "../../utils/log";
 import sleep from "../../utils/sleep";
+import { client } from "../../client";
+
+const PROJECT_CANIS_ALIAS = process.env.PROJECT_CANIS_ALIAS || "Canis";
 
 export default async function (notif: GroupNotification) {
   try {
@@ -10,9 +13,19 @@ export default async function (notif: GroupNotification) {
 
     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}`);
-      await sleep(2000); // prevent flooding
-      await notif.reply(`👋 Welcome *${name}* 🎉`);
+      if (isSelf) {
+        await notif.reply(
+          `🙋‍♂️ Hello everyone! I'm ${PROJECT_CANIS_ALIAS} your WhatsApp Bot,
+          for more information please send \`help\` or \`legal\.`,
+        );
+      } else {
+        await notif.reply(`👋 Welcome *${name}* 🎉`);
+      }
     }
   } catch (err) {
     log.error("Group Join", "Failed to process group join event:", err);

src/components/events/message.ts

@@ -5,13 +5,14 @@ import {
   MessageSendOptions,
 } from "whatsapp-web.js";
 import log from "../utils/log";
-import { commands } from "../../index";
+import { commands } from "../utils/cmd/loader";
 import rateLimiter from "../utils/rateLimiter";
 import sleep from "../utils/sleep";
 import { findOrCreateUser, isBlocked } from "../services/user";
 import { client } from "../client";
 import Font from "../utils/font";
 import quiz from "./quiz";
+import { errors } from "../utils/data";
 
 const commandPrefix = process.env.COMMAND_PREFIX || "!";
 const commandPrefixLess = process.env.COMMAND_PREFIX_LESS === "true";
@@ -177,24 +178,30 @@ export default async function (msg: Message) {
 
       if (statusMessages[status]) {
         const logFn = status === 500 ? log.error : log.warn;
-        logFn(key, statusMessages[status], { status, headers });
+        log.error(key, error);
         const text = `
-        \`${statusMessages[status]}\`
+        \`${errors[Math.floor(Math.random() * errors.length)]}\`\`
 
-          Error fetching data for "${key}" command the
-          provider returned a ${status} status code.
+          We encountered an error while processing ${key}.
+          Provider returned an error ${statusMessages[status]}.
+          We notify the developers of the issue.
+          Please try again later.
         `;
         await msg.reply(text);
         return;
       }
     }
-    log.error(
-      key,
-      "Unexpected error occurred while processing the request:",
-      error,
-    );
-    await msg.reply(
-      `An unexpected error occurred while processing your request for "${key}". Please try again later.`,
-    );
+    log.error(key, error);
+    const text = `
+    \`${errors[Math.floor(Math.random() * errors.length)]}\`
+
+      We encountered an error while processing ${key}.
+      We notify the developers of the issue.
+      Please try again later.
+      If the problem persists, please create an issue on GitHub.
+
+      https://github.com/project-canis/project-canis/issues/
+    `;
+    await msg.reply(text);
   }
 }

src/components/utils/cmd/loader.ts

@@ -1,11 +1,26 @@
 import log from "../log";
 import { promises as fs } from "fs";
 import path from "path";
-import { commands, commandDirs } from "../../../index";
 import { exec } from "child_process";
-import cliProgress from "cli-progress";
+import LoadingBar from "../loadingBar";
 import util from "util";
+import { Message } from "../../../../types/message";
 const execPromise = util.promisify(exec);
+const basePath = path.join(__dirname, "..", "..", "..", "commands");
+
+export const commandDirs = [basePath, path.join(basePath, "private")];
+export const commands: Record<
+  string,
+  {
+    command: string;
+    description: string;
+    usage: string;
+    example: string;
+    role: string;
+    cooldown: number;
+    exec: (msg: Message) => void;
+  }
+> = {};
 
 async function ensureDependencies(
   dependencies: { name: string; version: string }[],
@@ -75,7 +90,9 @@ export async function mapCommands() {
   for (const dir of commandDirs) {
     const files = await fs.readdir(dir);
 
-    const tuples: [string, string][] = files.map((f) => [f, dir] as [string, string]);
+    const tuples: [string, string][] = files.map(
+      (f) => [f, dir] as [string, string],
+    );
     allFiles = [...allFiles, ...tuples];
   }
 
@@ -85,16 +102,9 @@ export async function mapCommands() {
     return;
   }
 
-  const bar = new cliProgress.SingleBar(
-    {
-      format: "Loading Commands | {bar} | {value}/{total} {command}",
-      barCompleteChar: "█",
-      barIncompleteChar: "-",
-      hideCursor: true,
-    },
-    cliProgress.Presets.shades_classic,
+  const bar = LoadingBar(
+    "Loading Commands | {bar} | {value}/{total} {command}",
   );
-
   bar.start(total, 0, { command: "" });
 
   for (const [file, dir] of allFiles) {

src/components/utils/cmd/watcher.ts

@@ -2,7 +2,7 @@ import { watch } from "fs/promises";
 import loader from "./loader";
 import log from "../log";
 import path from "path";
-import { commandDirs } from "../../../index";
+import { commandDirs } from "./loader";
 
 export default async function () {
   for (const dir of commandDirs) {