feat: added unblock options for admins

Author: mrepol742

src/commands/block.ts

@@ -1,13 +1,13 @@
-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 { prisma } from "../components/prisma";
 
 export const info = {
   command: "block",
-  description: "Block or unblock users from sending messages.",
-  usage: "block <@user> [--rem]",
+  description: "Block users from the bot.",
+  usage: "block <@user>",
   example: "block @user123",
   role: "admin",
   cooldown: 5000,
@@ -19,18 +19,7 @@ export default async function (msg: Message) {
     return;
   }
 
-  if (/^block\s--rem/.test(msg.body)) {
-    for (const userId of msg.mentionedIds) {
-      const lid = userId.split("@")[0];
-
-      await prisma.block.delete({
-        where: { lid },
-      });
-    }
-
-    await msg.react("❌");
-    return;
-  }
+  await msg.react("🔄");
 
   for (const userId of msg.mentionedIds) {
     const lid = userId.split("@")[0];

src/commands/unblock.ts

@@ -0,0 +1,47 @@
+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 = {
+  command: "unblock",
+  description: "Unblock the users from the bot & rate limiter.",
+  usage: "unblock <@user>",
+  example: "unblock @user123",
+  role: "admin",
+  cooldown: 5000,
+};
+
+export default async function (msg: Message) {
+  if (msg.mentionedIds.length === 0) {
+    await msg.reply("Please mention a user to unblock.");
+    return;
+  }
+
+  await msg.react("🔄");
+
+  for (const userId of msg.mentionedIds) {
+    const lid = userId.split("@")[0];
+
+    await prisma.block.delete({
+      where: { lid },
+    });
+
+    const key = getKey(userId);
+    const entryRaw = await redis.get(key);
+
+    await redis.set(
+      key,
+      JSON.stringify({
+        timestamps: [] as number[],
+        penaltyCount: 0,
+        penaltyUntil: 0,
+      }),
+    );
+  }
+
+  await msg.react("✅");
+}

src/components/utils/rateLimiter.ts

@@ -7,7 +7,7 @@ const LIMIT = 5;
 const BASE_WINDOW_MS = 30 * 1000;
 const PENALTY_INCREMENT_MS = 10 * 1000;
 
-function getKey(number: string) {
+export function getKey(number: string) {
   return `rate:${number}`;
 }