getPermissionName --> getEnumName

Glazelf · Feb 19, 2025 · 80bddd5 · 80bddd5
1 parent d8bff2e
commit 80bddd5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 19 deletions.
diff --git a/commands/mod/ban.js b/commands/mod/ban.js
@@ -14,12 +14,12 @@ import {
 import sendMessage from "../../util/discord/sendMessage.js";
 import isAdmin from "../../util/discord/perms/isAdmin.js";
 import getTime from "../../util/getTime.js";
-import getPermissionName from "../../util/discord/getPermissionName.js";
+import getEnumName from "../../util/discord/getEnumName.js";
 import formatName from "../../util/discord/formatName.js";
 import globalVars from "../../objects/globalVars.json" with { type: "json" };
 
 const requiredPermission = PermissionFlagsBits.BanMembers;
-const requiredPermissionName = getPermissionName(requiredPermission);
+const requiredPermissionName = getEnumName(requiredPermission, PermissionFlagsBits);
 
 export default async (interaction, messageFlags) => {
     let adminBool = isAdmin(interaction.member);
@@ -56,7 +56,7 @@ export default async (interaction, messageFlags) => {
         let userRole = interaction.member.roles.highest;
         let targetRole = member.roles.highest;
         let botRole = interaction.guild.members.me.roles.highest;
-        if (member.id == interaction.guild.ownerId) return sendMessage({interaction: interaction, content: `I can not ban ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.`});
+        if (member.id == interaction.guild.ownerId) return sendMessage({ interaction: interaction, content: `I can not ban ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.` });
         if (targetRole.position >= userRole.position) return sendMessage({ interaction: interaction, content: `You can not ban ${usernameFormatted} (${member.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to yours (${formatName(userRole.name)}).` });
         if (targetRole.position >= botRole.position) return sendMessage({ interaction: interaction, content: `I can not ban ${usernameFormatted} (${user.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to mine (${formatName(botRole.name)}).` });
         if (!member.bannable) return sendMessage({ interaction: interaction, content: banFailString });

diff --git a/commands/mod/kick.js b/commands/mod/kick.js
@@ -11,12 +11,12 @@ import {
 import sendMessage from "../../util/discord/sendMessage.js";
 import isAdmin from "../../util/discord/perms/isAdmin.js";
 import getTime from "../../util/getTime.js";
-import getPermissionName from "../../util/discord/getPermissionName.js";
+import getEnumName from "../../util/discord/getEnumName.js";
 import formatName from "../../util/discord/formatName.js";
 import globalVars from "../../objects/globalVars.json" with { type: "json" };
 
 const requiredPermission = PermissionFlagsBits.KickMembers;
-const requiredPermissionName = getPermissionName(requiredPermission);
+const requiredPermissionName = getEnumName(requiredPermission, PermissionFlagsBits);
 
 export default async (interaction, messageFlags) => {
     let adminBool = isAdmin(interaction.member);
@@ -36,7 +36,7 @@ export default async (interaction, messageFlags) => {
     let userRole = interaction.member.roles.highest;
     let targetRole = member.roles.highest;
     let botRole = interaction.guild.members.me.roles.highest;
-    if (member.id == interaction.guild.ownerId) return sendMessage({interaction: interaction, content: `I can not kick ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.`});
+    if (member.id == interaction.guild.ownerId) return sendMessage({ interaction: interaction, content: `I can not kick ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.` });
     if (targetRole.position >= userRole.position) return sendMessage({ interaction: interaction, content: `You can not kick ${usernameFormatted} (${user.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to yours (${formatName(userRole.name)}).` });
     if (targetRole.position >= botRole.position) return sendMessage({ interaction: interaction, content: `I can not kick ${usernameFormatted} (${user.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to mine (${formatName(botRole.name)}).` });
     if (!member.kickable) return sendMessage({ interaction: interaction, content: kickFailString });

diff --git a/commands/mod/mute.js b/commands/mod/mute.js
@@ -13,12 +13,13 @@ import {
 import sendMessage from "../../util/discord/sendMessage.js";
 import isAdmin from "../../util/discord/perms/isAdmin.js";
 import getTime from "../../util/getTime.js";
-import getPermissionName from "../../util/discord/getPermissionName.js";
+import getEnumName from "../../util/discord/getEnumName.js";
 import formatName from "../../util/discord/formatName.js";
 import globalVars from "../../objects/globalVars.json" with { type: "json" };
 
 const requiredPermission = PermissionFlagsBits.ModerateMembers;
-const requiredPermissionName = getPermissionName(requiredPermission);
+const requiredPermissionName = getEnumName(requiredPermission, PermissionFlagsBits);
+console.log(requiredPermissionName)
 const maxMuteTime = 2_419_200_000; // Max time is 28 days, but we count in milliseconds
 
 export default async (interaction, messageFlags) => {
@@ -54,7 +55,7 @@ export default async (interaction, messageFlags) => {
     let targetRole = member.roles.highest;
     let botRole = interaction.guild.members.me.roles.highest;
     let usernameFormatted = formatName(user.username);
-    if (member.id == interaction.guild.ownerId) return sendMessage({interaction: interaction, content: `I can not mute ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.`});
+    if (member.id == interaction.guild.ownerId) return sendMessage({ interaction: interaction, content: `I can not mute ${usernameFormatted} (${member.id}) because they are the owner of ${formatName(interaction.guild.name)}.` });
     if (targetRole.position >= userRole.position) return sendMessage({ interaction: interaction, content: `You can not mute ${usernameFormatted} (${member.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to yours (${formatName(userRole.name)}).` });
     if (targetRole.position >= botRole.position) return sendMessage({ interaction: interaction, content: `I can not mute ${usernameFormatted} (${member.id}) because their highest role (${formatName(targetRole.name)}) is higher than or equal to mine (${formatName(botRole.name)}).` });
     if (!member.moderatable) return sendMessage({ interaction: interaction, content: `I can not mute this user. This might be because I lack the ${inlineCode(requiredPermissionName)} permission.` });

diff --git a/commands/mod/purge.js b/commands/mod/purge.js
@@ -10,12 +10,12 @@ import {
 } from "discord.js";
 import sendMessage from "../../util/discord/sendMessage.js";
 import isAdmin from "../../util/discord/perms/isAdmin.js";
-import getPermissionName from "../../util/discord/getPermissionName.js";
+import getEnumName from "../../util/discord/getEnumName.js";
 import formatName from "../../util/discord/formatName.js";
 import globalVars from "../../objects/globalVars.json" with { type: "json" };
 
 const requiredPermission = PermissionFlagsBits.ManageMessages;
-const requiredPermissionName = getPermissionName(requiredPermission);
+const requiredPermissionName = getEnumName(requiredPermission, PermissionFlagsBits);
 const filterOldMessages = true;
 
 export default async (interaction, messageFlags) => {

diff --git a/util/discord/getEnumName.js b/util/discord/getEnumName.js
@@ -0,0 +1,6 @@
+export default (input, enum1) => { // Can't name this "enum" outside of TypeScript files, rename this in #1019
+    for (const e of Object.keys(enum1)) {
+        if (enum1[e] === input) return e;
+    };
+    return null;
+};
diff --git a/util/discord/getPermissionName.js b/util/discord/getPermissionName.js