refactor: rename bot-admin role to admin and update related commands

Author: dconco

src/commands/admin.ts

@@ -1,9 +1,9 @@
 import { Message } from "../types/message";
-import { setBotAdmin } from "../components/services/user";
+import { setAdmin } from "../components/services/user";
 
 export const info = {
   command: "admin",
-  description: "Grant or revoke bot-admin status to mentioned users.",
+  description: "Grant or revoke admin (bot-level) status to mentioned users.",
   usage: "admin <@user>",
   example: "admin @user123",
   role: "super-admin",
@@ -12,15 +12,15 @@ export const info = {
 
 export default async function (msg: Message): Promise<void> {
   if (msg.mentionedIds.length === 0) {
-    await msg.reply("Please mention a user to toggle bot-admin status.");
+    await msg.reply("Please mention a user to grant or revoke admin.");
     return;
   }
 
+  const revoke = /--remove|--revoke|remove|revoke/i.test(msg.body);
   const lids = msg.mentionedIds.map((id) => id.split("@")[0]);
 
   for (const lid of lids) {
-    // Toggle: fetch current user and flip. To keep simple we'll set to true.
-    await setBotAdmin(lid, true);
+    await setAdmin(lid, !revoke);
   }
 
   await msg.react("✅");

src/commands/block.ts

@@ -6,7 +6,7 @@ export const info = {
   description: "Block users from the bot.",
   usage: "block <@user>",
   example: "block @user123",
-  role: "bot-admin",
+  role: "admin",
   cooldown: 5000,
 };
 

src/commands/help.ts

@@ -96,16 +96,6 @@ export default async function (msg: Message): Promise<void> {
     return;
   }
 
-  // help bot-admin
-  if (/^bot-admin$/i.test(query)) {
-    const botCommands = Object.values(commands)
-      .filter((cmd: CommandType) => cmd.role === "bot-admin")
-      .map((cmd: CommandType) => cmd.command)
-      .sort((a, b) => a.localeCompare(b));
-    await msg.reply(buildAdminPage(botCommands));
-    return;
-  }
-
   if (!/^[1-9]\d*$/.test(query) && query != "") {
     await msg.reply("Please type a valid page number.");
     return;
@@ -125,7 +115,6 @@ export default async function (msg: Message): Promise<void> {
 
   userCommands.unshift("admin");
   userCommands.unshift("super-admin");
-  userCommands.unshift("bot-admin");
 
   if (Object.values(commands).length === 0) {
     await msg.reply(`The *${page}* is obviously is not our bot bounds.`);

src/commands/reload.ts

@@ -8,7 +8,7 @@ export const info = {
   description: "Reload a specific command or all commands.",
   usage: "reload | [command]",
   example: "reload ai",
-  role: "bot-admin",
+  role: "admin",
   cooldown: 5000,
 };
 

src/commands/unblock.ts

@@ -7,7 +7,7 @@ export const info = {
   description: "Unblock the users from the bot & rate limiter.",
   usage: "unblock <@user>",
   example: "unblock @user123",
-  role: "bot-admin",
+  role: "admin",
   cooldown: 5000,
 };
 

src/commands/unload.ts

@@ -8,7 +8,7 @@ export const info = {
   description: "Unload a specific command.",
   usage: "unload [command]",
   example: "unload ai",
-  role: "bot-admin",
+  role: "admin",
   cooldown: 5000,
 };
 

src/components/events/message.ts

@@ -233,11 +233,12 @@ export default async function (msg: Message, type: string): Promise<void> {
           return;
         }
       }
-    } else if (handler.role === "bot-admin") {
+    } else if (handler.role === "admin") {
       if (!msg.fromMe) {
+        // admin role now covers previously 'bot-admin' privileges (stored in redis)
         try {
-          const { isBotAdmin } = await import("../services/user");
-          const ok = await isBotAdmin(lid);
+          const { isAdmin } = await import("../services/user");
+          const ok = await isAdmin(lid);
           if (!ok) return;
         } catch (err) {
           return;

src/components/services/user.ts

@@ -258,29 +258,25 @@ export async function unblockUser(lid: string): Promise<void> {
   }
 }
 
-export async function setBotAdmin(lid: string, value: boolean): Promise<void> {
+export async function setAdmin(lid: string, value: boolean): Promise<void> {
   try {
-    const key = `botadmin:${lid}`;
-    if (value) {
-      // set without TTL so privilege persists
-      await redis.set(key, "1");
-    } else {
-      await redis.del(key);
-    }
+    const key = `admin:${lid}`;
+    if (value) await redis.set(key, "1");
+    else await redis.del(key);
   } catch (error) {
     Sentry.captureException(error);
-    log.error("Redis", `Failed to set bot admin for: ${lid}`, error);
+    log.error("Redis", `Failed to set admin for: ${lid}`, error);
   }
 }
 
-export async function isBotAdmin(lid: string): Promise<boolean> {
+export async function isAdmin(lid: string): Promise<boolean> {
   try {
-    const key = `botadmin:${lid}`;
+    const key = `admin:${lid}`;
     const val = await redis.get(key);
     return val !== null;
   } catch (error) {
     Sentry.captureException(error);
-    log.error("Redis", `Failed to check bot admin: ${lid}`, error);
+    log.error("Redis", `Failed to check admin: ${lid}`, error);
   }
   return false;
 }