migrated from magic numbers to bitfields

xero-lib · Apr 28, 2024 · ea1e388 · ea1e388
1 parent 09843b5
commit ea1e388
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/commands/tsinit.js b/commands/tsinit.js
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction } from "discord.js";
+import { EmbedBuilder, ChatInputCommandInteraction, PermissionsBitField } from "discord.js";
 import { createRole, someRole, datedErr } from "../exports/functionExports.js";
 import { roles, developer, defaultPrefix as prefix } from "../exports/configExports.js";
 
@@ -11,7 +11,7 @@ import "../prototypes/tempReply.js";
  */
 
 export default async function (interaction) {
-    if (interaction.member.permissions.has(8) || interaction.member.id == developer.id) {
+    if (interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) || interaction.member.id == developer.id) {
         const tsinitEmbed = new EmbedBuilder()
 
         for(let role of roles){

diff --git a/commands/tsjoin.js b/commands/tsjoin.js
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction } from "discord.js";
+import { EmbedBuilder, ChatInputCommandInteraction, PermissionsBitField } from "discord.js";
 import { someRole, findRole, datedErr, hasRoles } from "../exports/functionExports.js";
 import { developer } from "../exports/configExports.js";
 
@@ -19,7 +19,7 @@ export default async function (interaction) {
     ) {
         if (//if interaction author is in Stick Controller group, an admin, or the developer for prod debugging reasons
             someRole(interaction.member, "Stick Controller") ||
-            interaction.member.permissions.has(8) ||
+            interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) ||
             interaction.member.id === developer.id
         ) {
             if (interaction.member.voice.channel && type == "voice") {//if  the user is in a voice channel and also passed the "voice" argument

diff --git a/commands/tsleave.js b/commands/tsleave.js
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction } from "discord.js";
+import { EmbedBuilder, ChatInputCommandInteraction, PermissionsBitField } from "discord.js";
 import { someRole, findRole, datedErr } from "../exports/functionExports.js";
 
 // import "../prototypes/tempSend.js";
@@ -12,7 +12,7 @@ import { someRole, findRole, datedErr } from "../exports/functionExports.js";
 export default async function (interaction) {
     const tsLeaveEmbed = new EmbedBuilder();
     let type = interaction.options.get("channel-type").value;
-    if ((someRole(interaction.member, "Stick Controller") || interaction.member.permissions.has(8))) {
+    if ((someRole(interaction.member, "Stick Controller") || interaction.member.permissions.has(PermissionsBitField.Flags.Administrator))) {
         if (someRole(interaction.guild, "Stick Holder")) {
             if (interaction.member.voice.channel && type === "voice") {
                 for (const [_, member] of interaction.guild.members.cache) 

diff --git a/commands/tspass.js b/commands/tspass.js
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction, GuildMember } from "discord.js";
+import { EmbedBuilder, ChatInputCommandInteraction, GuildMember, PermissionsBitField } from "discord.js";
 import { datedErr } from "../exports/functionExports.js";
 import { defaultPrefix as prefix, developer } from "../exports/configExports.js";
 import { findRole, someRole, hasRoles } from "../exports/functionExports.js";
@@ -15,7 +15,7 @@ export default async function (interaction) {
         if(
             someRole(interaction.member, "Stick Controller") ||
             someRole(interaction.member, "Stick Holder") ||
-            interaction.member.permissions.has(8) ||
+            interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) ||
             interaction.member.id === developer.id
         ) {
             /** @type {GuildMember} */ let member = interaction.options.getMember("recipient");

diff --git a/commands/tsremcon.js b/commands/tsremcon.js
@@ -1,4 +1,4 @@
-import { ChatInputCommandInteraction, EmbedBuilder } from "discord.js";
+import { ChatInputCommandInteraction, EmbedBuilder, PermissionsBitField } from "discord.js";
 import { someRole, findRole, datedErr } from "../exports/functionExports.js";
 import { developer } from "../exports/configExports.js";
 
@@ -7,7 +7,7 @@ import { developer } from "../exports/configExports.js";
  */
 
 export default async function (interaction) {
-    if (interaction.member.permissions.has(8) || interaction.member.id == developer.id) {
+    if (interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) || interaction.member.id == developer.id) {
         let member = interaction.options.getMember("stick-controller");
         if (someRole(interaction.guild, "Stick Controller")) {
             if (someRole(member, "Stick Controller")) {

diff --git a/commands/tsremstick.js b/commands/tsremstick.js
@@ -1,4 +1,4 @@
-import { EmbedBuilder, ChatInputCommandInteraction } from "discord.js";
+import { EmbedBuilder, ChatInputCommandInteraction, PermissionsBitField } from "discord.js";
 import { developer } from "../exports/configExports.js";
 import { hasRoles, findRole, someRole, datedErr } from "../exports/functionExports.js";
 
@@ -14,7 +14,7 @@ export default async function (interaction) {
     {
         if (
             someRole(interaction.guild, "Stick Holder" ||
-            interaction.member.permissions.has(8) ||
+            interaction.member.permissions.has(PermissionsBitField.Flags.Administrator) ||
             someRole(interaction.member, "Stick Controller") ||
             interaction.member.id === developer.id)
         )