feat: remove roles if no longer role menu access granted

Author: AlexProgrammerDE

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.2.5/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.3.3/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",

src/deploy-commands.ts

@@ -10,7 +10,12 @@ const commands = Array.from(commandManager.getCommands().values()).map(
   (command) => command.data.toJSON(),
 );
 
-const rest = new REST({ version: "10" }).setToken(process.env.DISCORD_TOKEN!);
+const token = process.env.DISCORD_TOKEN;
+if (!token) {
+  throw new Error("DISCORD_TOKEN is not set");
+}
+
+const rest = new REST({ version: "10" }).setToken(token);
 
 (async () => {
   try {

src/events/ready.ts

@@ -4,6 +4,7 @@ import {
   ChannelType,
   type Client,
   EmbedBuilder,
+  PermissionsBitField,
 } from "discord.js";
 import config from "../config/config";
 import { botHasRecentMessages, getServerData } from "../utils/helpers";
@@ -92,6 +93,74 @@ export const onReady = async (client: Client) => {
     await sendRoleMenu(roleChannel);
   }
 
+  async function cleanRoleMenuRoles() {
+    cronLog("CleanRoleMenuRoles", "Fetching guild");
+    const guild = await client.guilds.fetch(config.guildId);
+    if (!guild) {
+      cronLog("CleanRoleMenuRoles", "Guild not found, skipping");
+      return;
+    }
+
+    try {
+      await guild.members.fetch();
+    } catch (error) {
+      console.error(
+        "[Cron][CleanRoleMenuRoles] Failed to fetch guild members:",
+        error,
+      );
+      return;
+    }
+
+    const memberIdsWithMenuRoles = new Set<string>();
+
+    for (const roleId of config.roleMenuRoleIds) {
+      try {
+        const role =
+          guild.roles.cache.get(roleId) ?? (await guild.roles.fetch(roleId));
+        if (!role) {
+          cronLog("CleanRoleMenuRoles", `Role ${roleId} not found, skipping`);
+          continue;
+        }
+
+        role.members.forEach((member) => {
+          memberIdsWithMenuRoles.add(member.id);
+        });
+      } catch (error) {
+        console.error(
+          `[Cron][CleanRoleMenuRoles] Failed to inspect role ${roleId}:`,
+          error,
+        );
+      }
+    }
+
+    let removedCount = 0;
+    for (const memberId of memberIdsWithMenuRoles) {
+      const member = guild.members.cache.get(memberId);
+      if (!member) continue;
+
+      const hasAccess =
+        member.roles.cache.has(config.roleMenuRequiredRoleId) ||
+        member.permissions.has(PermissionsBitField.Flags.Administrator);
+
+      if (hasAccess) continue;
+
+      try {
+        await member.roles.remove(config.roleMenuRoleIds);
+        removedCount += 1;
+      } catch (error) {
+        console.error(
+          `[Cron][CleanRoleMenuRoles] Failed to remove role menu roles from ${member.id}:`,
+          error,
+        );
+      }
+    }
+
+    cronLog(
+      "CleanRoleMenuRoles",
+      `Removed role menu roles from ${removedCount} member(s)`,
+    );
+  }
+
   async function sendReactionRoleMenus() {
     const reactionRoleChannel = await client.channels.fetch(
       config.reactionRoleMenuId,
@@ -181,6 +250,13 @@ Select your notifications.
 
   await updateStatus();
   new cron.CronJob("*/5 * * * *", updateStatus, null, true, "Europe/Berlin");
+  new cron.CronJob(
+    "*/5 * * * *",
+    cleanRoleMenuRoles,
+    null,
+    true,
+    "Europe/Berlin",
+  );
 
   new cron.CronJob("0 10 * * *", sendReminder, null, true, "Europe/Berlin");
 
@@ -202,6 +278,7 @@ Select your notifications.
   );
 
   void sendRoleMenuMsg();
+  void cleanRoleMenuRoles();
   void sendReactionRoleMenus();
   void runSync();
 };

src/index.ts

@@ -44,9 +44,12 @@ async function initializeBot() {
     console.log("Loading commands...");
     await commandManager.loadCommands();
 
-    const rest = new REST({ version: "10" }).setToken(
-      process.env.DISCORD_TOKEN!,
-    );
+    const token = process.env.DISCORD_TOKEN;
+    if (!token) {
+      throw new Error("DISCORD_TOKEN is not set");
+    }
+
+    const rest = new REST({ version: "10" }).setToken(token);
     const commands = commandManager.getCommandsJSON();
     console.log(
       `Registering ${commands.length} commands to guild ${config.guildId}...`,
@@ -57,7 +60,7 @@ async function initializeBot() {
     );
 
     console.log("Initializing bot...");
-    await client.login(process.env.DISCORD_TOKEN!);
+    await client.login(token);
 
     console.log(
       `Bot initialized and ready to serve in guild: ${config.guildId}`,

src/types/command.ts

@@ -2,10 +2,16 @@ import type {
   ButtonInteraction,
   ChatInputCommandInteraction,
   ModalSubmitInteraction,
+  SlashCommandBuilder,
+  SlashCommandOptionsOnlyBuilder,
+  SlashCommandSubcommandsOnlyBuilder,
 } from "discord.js";
 
 export interface Command {
-  data: any;
+  data:
+    | SlashCommandBuilder
+    | SlashCommandSubcommandsOnlyBuilder
+    | SlashCommandOptionsOnlyBuilder;
   cooldown?: number;
   admin?: boolean;
   execute: (interaction: ChatInputCommandInteraction) => Promise<void>;

src/types/index.ts

@@ -1,14 +1,19 @@
 import type {
   ChatInputCommandInteraction,
   SlashCommandBuilder,
+  SlashCommandOptionsOnlyBuilder,
+  SlashCommandSubcommandsOnlyBuilder,
 } from "discord.js";
 
 export interface Command {
-  data: SlashCommandBuilder;
+  data:
+    | SlashCommandBuilder
+    | SlashCommandSubcommandsOnlyBuilder
+    | SlashCommandOptionsOnlyBuilder;
   execute: (interaction: ChatInputCommandInteraction) => Promise<void>;
 }
 
 export interface Event {
   name: string;
-  execute: (...args: any[]) => void;
+  execute: (...args: unknown[]) => void;
 }

src/utils/commandManager.ts

@@ -53,15 +53,19 @@ export class CommandManager {
     userId: string,
     cooldownSeconds: number,
   ): number {
-    if (!this.cooldowns.has(commandName)) {
-      this.cooldowns.set(commandName, new Collection());
+    let timestamps = this.cooldowns.get(commandName);
+    if (!timestamps) {
+      timestamps = new Collection();
+      this.cooldowns.set(commandName, timestamps);
     }
 
     const now = Date.now();
-    const timestamps = this.cooldowns.get(commandName)!;
 
     if (timestamps.has(userId)) {
-      const expirationTime = timestamps.get(userId)!;
+      const expirationTime = timestamps.get(userId);
+      if (!expirationTime) {
+        return 0;
+      }
       if (now < expirationTime) {
         return Math.ceil((expirationTime - now) / 1000);
       }