feat: update to block/unblock command

Author: mrepol742

src/commands/block.ts

@@ -2,6 +2,7 @@ import { Message } from "../types/message";
 import {
   addBlockUser,
   deductUserPoints,
+  getBlockUser,
   isAdmin,
 } from "../components/services/user";
 import client from "../components/client";
@@ -21,17 +22,26 @@ export default async function (msg: Message): Promise<void> {
     return;
   }
 
+  const jid = msg.mentionedIds[0];
+  const lid = jid.split("@")[0];
+
   const botId = (await client()).info.wid._serialized;
+  const isUserAdmin = await isAdmin(lid);
+
+  if (!msg.fromMe && (isUserAdmin || lid === botId.split("@")[0])) {
+    await msg.reply(`Unable block an ${isUserAdmin ? "Admin" : "Super Admin"}`);
+    return;
+  }
 
-  for (const userId of msg.mentionedIds) {
-    const lid = userId.split("@")[0];
-    const isUserAdmin = await isAdmin(lid);
-    if (isUserAdmin || lid === botId.split("@")[0]) {
-      await msg.reply(
-        `Unable to block ${isUserAdmin ? "Admin" : "Super Admin"}.`,
-      );
-      continue;
-    }
-    await Promise.allSettled([addBlockUser(lid), deductUserPoints(lid, 30)]);
+  const isBlocked = await getBlockUser(lid);
+  if (isBlocked) {
+    await msg.reply("The user is already blocked.");
+    return;
   }
+
+  await Promise.allSettled([
+    addBlockUser(lid),
+    deductUserPoints(lid, 30),
+    msg.reply("The user has been blocked."),
+  ]);
 }

src/commands/unblock.ts

@@ -1,6 +1,6 @@
-import { Message } from "../types/message"
+import { Message } from "../types/message";
 import redis from "../components/redis";
-import { unblockUser } from "../components/services/user";
+import { getBlockUser, unblockUser } from "../components/services/user";
 
 export const info = {
   command: "unblock",
@@ -17,17 +17,21 @@ export default async function (msg: Message): Promise<void> {
     return;
   }
 
-  const lids = msg.mentionedIds.map((id) => id.split("@")[0]);
+  const jid = msg.mentionedIds[0];
+  const lid = jid.split("@")[0];
+
+  const isBlocked = await getBlockUser(lid);
+  if (!isBlocked) {
+    await msg.reply("The user is not block.");
+    return;
+  }
 
   await Promise.all([
-    lids.map((lid) => unblockUser(lid)),
-    lids.map((lid) =>
-      redis.set(
-        `rate:${lid}`,
-        JSON.stringify({ timestamps: [], penaltyCount: 0, penaltyUntil: 0 }),
-      ),
+    unblockUser(lid),
+    redis.set(
+      `rate:${lid}`,
+      JSON.stringify({ timestamps: [], penaltyCount: 0, penaltyUntil: 0 }),
     ),
+    msg.reply("The user has been unblocked."),
   ]);
-
-  await msg.react("✅");
 }