feat: bug fixes and improvements

Author: mrepol742

src/commands/event.ts

@@ -12,14 +12,9 @@ export const info = {
 export default async function (msg: Message) {
   if (!/^event/i.test(msg.body)) return;
 
-  let event: Message;
+  let event: Message = msg;
 
-  if (msg.hasQuotedMsg) {
-    const quotedEvent = await msg.getQuotedMessage();
-    event = quotedEvent;
-  } else {
-    event = msg;
-  }
+  if (msg.hasQuotedMsg) event = await msg.getQuotedMessage();
 
   await msg.reply("```" + JSON.stringify(event, null, 2) + "```");
 }

src/commands/lid.ts

@@ -0,0 +1,28 @@
+import { Message } from "../../types/message";
+import log from "../components/utils/log";
+
+export const info = {
+  command: "lid",
+  description: "Get your LID",
+  usage: "lid",
+  example: "lid",
+  role: "user",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message) {
+  if (!/^lid/i.test(msg.body)) return;
+
+  let message: Message = msg;
+  if (msg.hasQuotedMsg) message = await msg.getQuotedMessage();
+
+  const lid = message.author
+    ? message.author.split("@")[0]
+    : message.from.split("@")[0];
+
+  await msg.reply(`
+    \`Your LID\`
+
+    ${lid}
+  `);
+}

src/commands/reload.ts

@@ -34,21 +34,18 @@ export default async function (msg: Message) {
       }
     }
 
-    if (!found) {
-      await msg.reply(`
-        \`Failed to load\`
+    if (!found)
+      return await msg.reply(`
+    \`Failed to load\`
 
-        ${query}
+    ${query}
       `);
-    } else {
-      await msg.reply(`
-        \`Successfully reloaded\`
 
-        ${query}
-      `);
-    }
+    return await msg.reply(`
+    \`Successfully reloaded\`
 
-    return;
+    ${query}
+    `);
   }
 
   // Reload all commands

src/commands/stalk.ts

@@ -1,6 +1,6 @@
 import { Message } from "../../types/message";
-import { getQuizCount } from "../components/services/quiz";
 import { getUserbyLid, isBlocked } from "../components/services/user";
+import redis from "../components/redis";
 
 export const info = {
   command: "stalk",
@@ -18,12 +18,15 @@ export default async function (msg: Message) {
   }
 
   const lid = msg.mentionedIds[0].split("@")[0];
-  const [user, isBlockUser] = await Promise.all([
+  const [user, isBlockPermanently, isBlockedTemporarily] = await Promise.all([
     getUserbyLid(lid),
     isBlocked(lid),
+    redis.get(`rate:${lid}`),
   ]);
   if (!user) return await msg.reply("User not found.");
 
+  console.log(JSON.stringify(isBlockedTemporarily))
+
   const text = `
     \`${user.name}\`
     ${user.about || "No about information available."}
@@ -35,7 +38,7 @@ export default async function (msg: Message) {
     Mode: ${user.mode}
     Command Count: ${user.commandCount}
     Last Seen: ${new Date(user.updatedAt).toLocaleString()}
-    Blocked: ${isBlockUser ? "Yes" : "No"}
+    Blocked: ${isBlockPermanently ? "Permanently Blocked" : (isBlockedTemporarily ? JSON.parse(isBlockedTemporarily).penaltyCount : "No")}
   `;
   await msg.reply(text);
 }

src/commands/unblock.ts

@@ -1,9 +1,5 @@
 import { Message } from "../../types/message";
-import log from "../components/utils/log";
-import { exec } from "child_process";
-import util from "util";
 import { prisma } from "../components/prisma";
-import { getKey } from "../components/utils/rateLimiter";
 import redis from "../components/redis";
 
 export const info = {
@@ -29,5 +25,14 @@ export default async function (msg: Message) {
     where: { lid: { in: lids } },
   });
 
+  await Promise.all(
+    msg.mentionedIds.map((lid) =>
+      redis.set(
+        `rate:${lid}`,
+        JSON.stringify({ timestamps: [], penaltyCount: 0, penaltyUntil: 0 }),
+      ),
+    ),
+  );
+
   await msg.react("✅");
 }

src/commands/update.ts

@@ -2,8 +2,6 @@ import { Message } from "../../types/message";
 import log from "../components/utils/log";
 import { exec } from "child_process";
 import util from "util";
-import { prisma } from "../components/prisma";
-import { getKey } from "../components/utils/rateLimiter";
 import redis from "../components/redis";
 
 export const info = {

src/components/events/message.ts

@@ -51,7 +51,7 @@ export default async function (msg: Message, type: string) {
     .trim();
 
   const prefix = !msg.body.startsWith(commandPrefix);
-  const senderId = msg.from.split("@")[0];
+  const lid = msg.author ? msg.author.split("@")[0] : msg.from.split("@")[0];
 
   /*
    * Prefix
@@ -73,21 +73,17 @@ export default async function (msg: Message, type: string) {
   /*
    * Block users from running commands.
    */
-  const isBlockedUser = await isBlocked(
-    msg.author ? msg.author.split("@")[0] : senderId,
-  );
-  if (isBlockedUser) {
-    return;
-  }
+  const isBlockedUser = await isBlocked(lid);
+  if (isBlockedUser) return;
 
   /*
    * Rate limit commands to prevent abuse.
    */
   if (!msg.fromMe) {
-    const rate = await rateLimiter(msg);
+    const rate = await rateLimiter(lid);
     if (rate) return;
     if (rate === null) {
-      msg.reply("Please wait a minute or so.");
+      await msg.reply("Please wait a minute or so.");
       return;
     }
 
@@ -118,7 +114,7 @@ export default async function (msg: Message, type: string) {
     return;
   }
 
-  log.info("Message", senderId, msg.body.slice(0, 150));
+  log.info("Message", lid, msg.body.slice(0, 150));
   msg.body = !bodyHasPrefix ? msg.body : msg.body.slice(commandPrefix.length);
 
   const originalReply = msg.reply.bind(msg);
@@ -129,9 +125,8 @@ export default async function (msg: Message, type: string) {
   ): Promise<Message> => {
     let messageBody = typeof content === "string" ? Font(content) : content;
 
-    if (Math.random() < 0.5) {
+    if (Math.random() < 0.5)
       return await client.sendMessage(msg.id.remote, messageBody, options);
-    }
     return await originalReply(messageBody, chatId, options);
   };
 

src/components/utils/rateLimiter.ts

@@ -1,4 +1,3 @@
-import { Message } from "whatsapp-web.js";
 import redis from "../redis";
 import log from "./log";
 import { prisma } from "../prisma";
@@ -7,16 +6,11 @@ const LIMIT = 5;
 const BASE_WINDOW_MS = 30 * 1000;
 const PENALTY_INCREMENT_MS = 10 * 1000;
 
-export function getKey(number: string) {
-  return `rate:${number}`;
-}
-
 export default async function rateLimiter(
-  msg: Message,
+  lid: string,
 ): Promise<boolean | null> {
-  const number = msg.from;
   const now = Date.now();
-  const key = getKey(number);
+  const key = `rate:${lid}`;
 
   const entryRaw = await redis.get(key);
   let entry = entryRaw
@@ -47,14 +41,14 @@ export default async function rateLimiter(
 
     log.warn(
       "RateLimiter",
-      `User ${number} blocked until ${new Date(entry.penaltyUntil).toLocaleTimeString()}`,
+      `User ${lid} blocked until ${new Date(entry.penaltyUntil)}`,
     );
 
     await Promise.all([
       redis.set(key, JSON.stringify(entry)),
       prisma.user.update({
         where: {
-          lid: msg.author ? msg.author.split("@")[0] : msg.from.split("@")[0],
+          lid,
         },
         data: {
           quizAnswered: {