feat: bug fixes and improvements

Author: mrepol742

src/commands/everyone.ts

@@ -1,5 +1,5 @@
-import { GroupChat } from "whatsapp-web.js";
-import { Message } from "../types/message"
+import { GroupChat, MessageMedia } from "whatsapp-web.js";
+import { Message } from "../types/message";
 import log from "../components/utils/log";
 import sleep from "../components/utils/sleep";
 import { helloMessage } from "../components/utils/data";
@@ -29,7 +29,7 @@ export default async function (msg: Message): Promise<void> {
   const groupChat = chat as GroupChat;
   const participants = groupChat.participants;
 
-  const self = (await client()).info.wid._serialized
+  const self = (await client()).info.wid._serialized;
   const filteredParticipants = participants.filter((p) => {
     if (p.id._serialized === self) return false;
     if (onlyAdmins && !p.isAdmin && !p.isSuperAdmin) return false;
@@ -47,8 +47,29 @@ export default async function (msg: Message): Promise<void> {
 
   const mentions = filteredParticipants.map((p) => p.id._serialized);
   const total = mentions.length;
-  const baseText =
-    helloMessage[Math.floor(Math.random() * helloMessage.length)];
+
+  const [baseText, media] = await Promise.all([
+    (async () => {
+      const defaultMessage =
+        helloMessage[Math.floor(Math.random() * helloMessage.length)];
+      if (!msg.hasQuotedMsg) return defaultMessage;
+
+      const qoutedMessage = await msg.getQuotedMessage();
+      return qoutedMessage.body ? qoutedMessage.body : defaultMessage;
+    })(),
+    (async () => {
+      if (msg.hasMedia) return await msg.downloadMedia();
+    })(),
+  ]);
+
+  if (media && (["sticker", "ptt"].includes(msg.type) || msg.isGif)) {
+    await msg.reply(media);
+  }
+
+  const mediaShouldBeSend = !(
+    ["sticker", "ptt"].includes(msg.type) && msg.isGif
+  );
+
   // i made it per batch to prevent rate limiting and possibly issues
   const batchSize = 30;
 
@@ -60,7 +81,14 @@ export default async function (msg: Message): Promise<void> {
 
     const messageText = i === 0 ? `${baseText}\n\n${mentionText}` : mentionText;
 
-    await msg.reply(messageText, undefined, { mentions: batchMentions });
+    await msg.reply(
+      mediaShouldBeSend ? (media ? media : messageText) : messageText,
+      undefined,
+      {
+        caption: mediaShouldBeSend ? (media ? messageText : "") : "",
+        mentions: batchMentions,
+      },
+    );
 
     const min = 2000;
     const max = 6000;

src/commands/lid.ts

@@ -1,8 +1,7 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 import log from "../components/utils/log";
 import { exec } from "child_process";
 import util from "util";
-import redis from "../components/redis";
 
 export const info = {
   command: "update",
@@ -21,7 +20,7 @@ export default async function (msg: Message): Promise<void> {
   if (stderr) log.warn("Update", `git pull stderr:\n${stderr}`);
 
   const { stdout: commitInfo } = await execPromise(
-    'git log -1 --pretty=format:"%h - %s (%an, %ar)"',
+    'git log -7 --pretty=format:"%h - %s (%an, %ar)"',
   );
 
   const text = `

src/commands/update.ts

@@ -92,10 +92,8 @@ function registerEvents(client: Client): void {
   client.on("message_create", (msg: Message) => {
     CheckSpamLink(msg);
     messageEvent(msg, "create");
+     queue.add(() => DownloadMedia(msg))
   });
-  client.on("media_uploaded", (msg: Message) =>
-    queue.add(() => DownloadMedia(msg)),
-  );
 
   client.on(
     "message_edit",

src/components/client.ts

@@ -33,6 +33,10 @@ export default async function (msg: Message, type: string): Promise<void> {
     if (!msg.body) return;
     if (msg.timestamp < Date.now() / 1000 - 60 && type === "create") return;
     if (msg.isGif || msg.isStatus || msg.broadcast || msg.isForwarded) return; // ignore them all
+
+    // ignore @Meta AI and others
+    if (msg.author && msg.author.split("@")[1] === "bot") return;
+
     const lid: string = msg.author
       ? msg.author.split("@")[0]
       : msg.from.split("@")[0];

src/components/events/message.ts

@@ -2,7 +2,7 @@ import { Client, Reaction } from "whatsapp-web.js";
 import log from "../utils/log";
 import sleep from "../utils/sleep";
 import { getSetting } from "../services/settings";
-import { rateLimiter } from "../utils/rateLimiter";
+import { penalizeUser, rateLimiter } from "../utils/rateLimiter";
 import { getBlockUser } from "../services/user";
 import * as Sentry from "@sentry/node";
 import redis from "../redis";
@@ -14,6 +14,9 @@ export default async function (client: Client, react: Reaction): Promise<void> {
   // ignore react if it is older than 60 seconds
   if (react.timestamp < Date.now() / 1000 - 60) return;
 
+  // ignore @Meta AI and others
+  if (react.senderId.split("@")[1] === "bot") return;
+
   const key = `react:${react.id.id}`;
   const alreadyReacted = await redis.get(key);
   if (alreadyReacted) return;
@@ -28,14 +31,12 @@ export default async function (client: Client, react: Reaction): Promise<void> {
     getSetting("react_repeater"),
   ]);
 
-  if (
-    isBlockedUser ||
-    isRateLimit.status ||
-    isRateLimit.value.timestamps.length > 5 ||
-    !isMustRepeatReact ||
-    isMustRepeatReact == "off"
-  )
+  if (isRateLimit.status || isRateLimit.value.timestamps.length > 5) {
+    await penalizeUser(senderId, isRateLimit.value);
     return;
+  }
+
+  if (isBlockedUser || !isMustRepeatReact || isMustRepeatReact == "off") return;
 
   try {
     const message = await client.getMessageById(react.msgId._serialized);

src/components/events/reaction.ts

@@ -46,6 +46,13 @@ export default async function (
       : null;
 
     log.info("RevokeMessage", lid);
+
+    // cant include captions under this certain messages
+    // so caption will be send first before the deleted message
+    if (["sticker", "ptt"].includes(msg.type) || msg.isGif) {
+      await msg.reply(caption);
+    }
+
     await Promise.all([
       addMessage(lid, revoked_msg.body, "revoke"),
       msg.reply(media || caption, undefined, {