feat: streamline message handling by removing random response logic and add message edit event handling

Author: mrepol742

src/commands/ai.ts

@@ -33,11 +33,6 @@ export default async function (msg: Message) {
     await msg.reply("Sorry, I couldn't generate a response. Please try again.");
     return;
   }
-
-  if (Math.random() < 0.5) {
-    const chat = await msg.getChat();
-    await client.sendMessage(chat.id._serialized, text);
-    return;
-  }
+  
   await msg.reply(text);
 }

src/commands/mj.ts

@@ -40,12 +40,6 @@ export default async function (msg: Message) {
     );
     return;
   }
-  const font = Font(text);
 
-  if (Math.random() < 0.5) {
-    const chat = await msg.getChat();
-    await client.sendMessage(chat.id._serialized, font);
-    return;
-  }
-  await msg.reply(font);
+  await msg.reply(text);
 }

src/commands/sim.ts

@@ -38,10 +38,5 @@ export default async function (msg: Message) {
     return;
   }
 
-  if (Math.random() < 0.5) {
-    const chat = await msg.getChat();
-    await client.sendMessage(chat.id._serialized, text);
-    return;
-  }
   await msg.reply(text);
 }

src/components/client.ts

@@ -8,6 +8,7 @@ import {
 } from "whatsapp-web.js";
 import qrcode from "qrcode-terminal";
 import messageEvent from "./events/message";
+import messageEdit from "./events/edit";
 import groupLeave from "./events/groups/leave";
 import groupJoin from "./events/groups/join";
 import reaction from "./events/reaction";
@@ -17,22 +18,32 @@ const client = new Client({
   authStrategy: new LocalAuth(),
 });
 
+client.on("loading_screen", (percent: number, message: string) =>
+  log.info("loading", `..................... ${percent}%`)
+);
+client.on("authenticated", () =>
+  log.info("auth", "Client authenticated successfully.")
+);
 client.on("qr", (qr: string) => {
   // Generate and scan this code with your phone
-  log.info("QR Code", "Scan this QR code with your WhatsApp app:");
+  log.info("qrcode", "Scan this QR code with your WhatsApp app:");
   qrcode.generate(qr, { small: true });
 });
-
 client.on("ready", async () => ready());
 client.on("message_reaction", async (react: Reaction) =>
   reaction(client, react)
 );
-client.on("group_join", async (notif: GroupNotification) => groupJoin(notif));
-client.on("group_leave", async (notif: GroupNotification) => groupLeave(notif));
 // 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)
+);
+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.")
+  log.error("auth", "Authentication failed. Please try again.")
 );
 
 client.initialize();

src/components/events/edit.ts

@@ -0,0 +1,5 @@
+import { Message } from "whatsapp-web.js";
+
+export default async function (msg: Message, newBody: String, prevBody: String) {
+  await msg.reply(`Your message was edited from "${prevBody}."`);
+}

src/components/events/message.ts

@@ -1,10 +1,17 @@
-import { Message } from "whatsapp-web.js";
+import {
+  Client,
+  Message,
+  MessageContent,
+  MessageSendOptions,
+} from "whatsapp-web.js";
 import log from "../utils/log";
 import { commands } from "../../index";
 import rateLimiter from "../utils/rateLimiter";
 import { isRateLimitError, getRateLimitInfo } from "../utils/rateLimit";
 import sleep from "../utils/sleep";
 import { findOrCreateUser, isBlocked } from "../services/user";
+import { client } from "../client";
+import Font from "../utils/font";
 
 const commandPrefix = process.env.COMMAND_PREFIX || "!";
 const commandPrefixLess = process.env.COMMAND_PREFIX_LESS === "true";
@@ -44,7 +51,9 @@ export default async function message(msg: Message) {
   /*
    * Block users from running commands.
    */
-  const isBlockedUser = await isBlocked(msg.author ? msg.author.split("@")[0] : senderId);
+  const isBlockedUser = await isBlocked(
+    msg.author ? msg.author.split("@")[0] : senderId
+  );
   if (isBlockedUser) {
     return;
   }
@@ -73,6 +82,21 @@ export default async function message(msg: Message) {
   }
   msg.body = !bodyHasPrefix ? msg.body : msg.body.slice(commandPrefix.length);
 
+  const originalReply = msg.reply.bind(msg);
+  msg.reply = async (
+    content: MessageContent,
+    chatId?: string,
+    options?: MessageSendOptions
+  ): Promise<Message> => {
+    let text =
+      Font(typeof content === "string" ? content : (content as any).body) || "";
+
+    if (Math.random() < 0.5) {
+      return await client.sendMessage(msg.id.remote, text);
+    }
+    return await originalReply(text, chatId, options);
+  };
+
   /*
    * Execute the command handler.
    */