From 09afcc80a60279c946d821bbea7f30c8aa8fb5fa Mon Sep 17 00:00:00 2001
From: toast-ts <96593068+toast-ts@users.noreply.github.com>
Date: Sun, 14 Jan 2024 17:58:25 +1100
Subject: [PATCH] Filter moderator role properly

---
 src/components/Punish.ts   | 2 +-
 src/helpers/MessageTool.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Punish.ts b/src/components/Punish.ts
index df10240..d0ebf9e 100644
--- a/src/components/Punish.ts
+++ b/src/components/Punish.ts
@@ -2,7 +2,7 @@ import Discord from 'discord.js';
 import TClient from '../client.js';
 import MessageTool from '../helpers/MessageTool.js';
 export default async(client:TClient, interaction: Discord.ChatInputCommandInteraction<'cached'>, type: 'ban'|'softban'|'kick'|'mute'|'warn'|'remind')=>{
-  if (!MessageTool.isStaff(interaction.member)) return MessageTool.youNeedRole(interaction, 'dcmod');
+  if (!MessageTool.isModerator(interaction.member)) return MessageTool.youNeedRole(interaction, 'dcmod');
 
   const time = interaction.options.getString('time') ?? undefined;
   const reason = interaction.options.getString('reason') ?? 'Reason unspecified';
diff --git a/src/helpers/MessageTool.ts b/src/helpers/MessageTool.ts
index 8c801af..1993442 100644
--- a/src/helpers/MessageTool.ts
+++ b/src/helpers/MessageTool.ts
@@ -14,4 +14,5 @@ export default class MessageTool {
   static formatMention =(mention:string, type:'user'|'channel'|'role')=>`<${type === 'role' ? '@&' : type === 'channel' ? '#' : '@'}${mention}>`;
   static isStaff =(guildMember:Discord.GuildMember)=>config.dcServer.staffRoles.map((x:string)=>config.dcServer.roles[x]).some((x:string)=>guildMember.roles.cache.has(x));
   static youNeedRole =(interaction:Discord.CommandInteraction, role:RoleKeys)=>interaction.reply(`You do not have ${this.formatMention(config.dcServer.roles[role], 'role')} role to use this command.`);
+  static isModerator =(guildMember:Discord.GuildMember)=>config.dcServer.staffRoles.filter((x:string)=>/^admin|^dcmod/.test(x)).map((x:string)=>config.dcServer.roles[x]).some((x:string)=>guildMember.roles.cache.has(x));
 }