Rewrite Officer Commands

Author: Kathund

src/contracts/minecraftCommand.js

@@ -5,6 +5,7 @@ const config = require("../../config.json");
 class minecraftCommand {
   constructor(minecraft) {
     this.minecraft = minecraft;
+    this.officer = false;
   }
 
   getArgs(message) {
@@ -15,7 +16,7 @@ class minecraftCommand {
     return args;
   }
 
-  send(message, officer = false, n = 1) {
+  send(message, n = 1) {
     if (bot === undefined && bot._client.chat === undefined) {
       return;
     }
@@ -30,12 +31,12 @@ class minecraftCommand {
 
         if (n >= 5) {
           return this.send(
-            `/${officer ? "oc" : "gc"} Command failed to send message after 5 attempts. Please try again later.`,
+            "Command failed to send message after 5 attempts. Please try again later.",
           );
         }
 
         await delay(250);
-        return this.send(`/${officer ? "oc" : "gc"} ${message}`);
+        return this.send(`${message}`);
       } else if (
         msg.toString().includes("You cannot say the same message twice!") === true &&
         msg.toString().includes(":") === false
@@ -45,27 +46,27 @@ class minecraftCommand {
 
         if (n >= 5) {
           return this.send(
-            `/${officer ? "oc" : "gc"} Command failed to send message after 5 attempts. Please try again later.`,
+            `Command failed to send message after 5 attempts. Please try again later.`,
           );
         }
 
         await delay(250);
         return this.send(
-          `/${officer ? "oc" : "gc"} ${message} - ${helperFunctions.generateID(config.minecraft.bot.messageRepeatBypassLength)}`,
+          `${message} - ${helperFunctions.generateID(config.minecraft.bot.messageRepeatBypassLength)}`,
           n + 1,
         );
       }
     };
 
     bot.once("message", listener);
-    bot.chat(`/${officer ? "oc" : "gc"} ${message}`);
+    bot.chat(`/${this.officer ? "oc" : "gc"} ${message}`);
 
     setTimeout(() => {
       bot.removeListener("message", listener);
     }, 500);
   }
 
-  onCommand(player, message, officer) {
+  onCommand(player, message) {
     throw new Error("Command onCommand method is not implemented yet!");
   }
 }

src/minecraft/CommandHandler.js

@@ -34,8 +34,9 @@ class CommandHandler {
         return;
       }
 
+      command.officer = officer;
       Logger.minecraftMessage(`${player} - [${command.name}] ${message}`);
-      command.onCommand(player, message, officer);
+      command.onCommand(player, message);
     } else if (message.startsWith("-") && message.startsWith("- ") === false) {
       if (config.minecraft.commands.soopy === false || message.at(1) === "-") {
         return;

src/minecraft/commands/8ballCommand.js

@@ -17,7 +17,7 @@ class EightBallCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       if (this.getArgs(message).length === 0) {
         // eslint-disable-next-line no-throw-literal
@@ -26,9 +26,9 @@ class EightBallCommand extends minecraftCommand {
 
       const { data } = await axios.get(`https://www.eightballapi.com/api`);
 
-      this.send(`${data.reading}`, officer);
+      this.send(`${data.reading}`);
     } catch (error) {
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 }

src/minecraft/commands/UHCStatsCommmand.js

@@ -17,23 +17,22 @@ class UHCStatsCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       username = this.getArgs(message)[0] || username;
 
       const player = await hypixel.getPlayer(username);
 
       const { starLevel, KDRatio, wins, headsEaten } = player.stats.uhc;
 
-      this.send(`[${starLevel}✫] ${player.nickname} | KDR: ${KDRatio} | W: ${wins} | Heads: ${headsEaten}`, officer);
+      this.send(`[${starLevel}✫] ${player.nickname} | KDR: ${KDRatio} | W: ${wins} | Heads: ${headsEaten}`);
     } catch (error) {
       this.send(
         `${error
           .toString()
           .replace("[hypixel-api-reborn] ", "")
           .replace("For help join our Discord Server https://discord.gg/NSEBNMM", "")
           .replace("Error:", "[ERROR]")}`,
-        officer,
       );
     }
   }

src/minecraft/commands/accessoriesCommand.js

@@ -19,7 +19,7 @@ class AccessoriesCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       username = this.getArgs(message)[0] || username;
 
@@ -50,10 +50,9 @@ class AccessoriesCommand extends minecraftCommand {
         `${username}'s Accessories: ${talismans?.total ?? 0} (${rarities}), Recombed: ${
           talismans?.recombed ?? 0
         }, Enriched: ${talismans?.enriched ?? 0} | Reforge: ${talismans.power} | Magic Power: ${talismans.magicPower}`,
-        officer,
       );
     } catch (error) {
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 }

src/minecraft/commands/auctionHouseCommand.js

@@ -23,7 +23,7 @@ class AuctionHouseCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       username = this.getArgs(message)[0] || username;
 
@@ -41,7 +41,7 @@ class AuctionHouseCommand extends minecraftCommand {
       const player = playerResponse.data?.player || {};
 
       if (auctions.length === 0) {
-        return this.send("This player has no active auctions.", officer);
+        return this.send("This player has no active auctions.");
       }
 
       const activeAuctions = auctions.filter((auction) => auction.end >= Date.now());
@@ -91,10 +91,10 @@ class AuctionHouseCommand extends minecraftCommand {
       }
 
       imgurUrl = string;
-      this.send(`/gc $${username}'s Active Auctions: Check Discord Bridge for image.`, officer);
+      this.send(`/gc $${username}'s Active Auctions: Check Discord Bridge for image.`);
     } catch (error) {
       console.log(error);
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 }

src/minecraft/commands/bedwarsStatsCommand.js

@@ -18,7 +18,7 @@ class BedwarsCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       const msg = this.getArgs(message).map((arg) => arg.replaceAll("/", ""));
       const modes = ["solo", "doubles", "threes", "fours", "4v4"];
@@ -36,7 +36,6 @@ class BedwarsCommand extends minecraftCommand {
           `[${level}✫] ${player.nickname} FK: ${formatNumber(finalKills)} FKDR: ${finalKDRatio} W: ${formatNumber(
             wins,
           )} WLR: ${WLRatio} BB: ${formatNumber(broken)} BLR: ${BLRatio} WS: ${winstreak}`,
-          officer,
         );
       } else if (mode !== undefined) {
         const { level } = player.stats.bedwars;
@@ -49,10 +48,9 @@ class BedwarsCommand extends minecraftCommand {
           )} FKDR: ${finalKDRatio} Wins: ${formatNumber(wins)} WLR: ${WLRatio} BB: ${formatNumber(
             broken,
           )} BLR: ${BLRatio} WS: ${winstreak}`,
-          officer,
         );
       } else {
-        this.send("Invalid mode. Valid modes: overall, solo, doubles, threes, fours, 4v4", officer);
+        this.send("Invalid mode. Valid modes: overall, solo, doubles, threes, fours, 4v4");
       }
     } catch (error) {
       this.send(
@@ -61,7 +59,6 @@ class BedwarsCommand extends minecraftCommand {
           .replace("[hypixel-api-reborn] ", "")
           .replace("For help join our Discord Server https://discord.gg/NSEBNMM", "")
           .replace("Error:", "[ERROR]")}`,
-        officer,
       );
     }
   }

src/minecraft/commands/bestiaryCommand.js

@@ -19,7 +19,7 @@ class BestiaryCommand extends minecraftCommand {
     ];
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     try {
       const args = this.getArgs(message);
 
@@ -33,7 +33,7 @@ class BestiaryCommand extends minecraftCommand {
 
       const bestiary = getBestiary(data.profile);
       if (bestiary === null) {
-        return this.send("This player has not yet joined SkyBlock since the bestiary update.", officer);
+        return this.send("This player has not yet joined SkyBlock since the bestiary update.");
       }
 
       if (mob) {
@@ -44,7 +44,6 @@ class BestiaryCommand extends minecraftCommand {
             `${username}'s ${mobData.name} Bestiary: ${mobData.kills} / ${mobData.nextTierKills} (${
               mobData.nextTierKills - mobData.kills
             })`,
-            officer,
           );
 
           await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -53,7 +52,6 @@ class BestiaryCommand extends minecraftCommand {
 
       this.send(
         `${username}'s Bestiary Milestone: ${bestiary.milestone} / ${bestiary.maxMilestone} | Unlocked Tiers: ${bestiary.tiersUnlocked} / ${bestiary.totalTiers}`,
-        officer,
       );
 
       if (playerUsername === username) {
@@ -68,11 +66,11 @@ class BestiaryCommand extends minecraftCommand {
 
         await new Promise((resolve) => setTimeout(resolve, 1000));
 
-        this.send(`Closest to level up: ${topFiveMobs.join(", ")}`, officer);
+        this.send(`Closest to level up: ${topFiveMobs.join(", ")}`);
       }
     } catch (error) {
       console.log(error);
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 

src/minecraft/commands/boopCommand.js

@@ -19,7 +19,7 @@ class BoopCommand extends minecraftCommand {
     this.isOnCooldown = false;
   }
 
-  async onCommand(username, message, officer) {
+  async onCommand(username, message) {
     // CREDITS: by @Zickles (https://github.com/Zickles)
     try {
       if (this.getArgs(message).length === 0) {
@@ -28,14 +28,14 @@ class BoopCommand extends minecraftCommand {
       }
 
       if (this.isOnCooldown) {
-        return this.send(`${this.name} Command is on cooldown`, officer);
+        return this.send(`${this.name} Command is on cooldown`);
       }
 
       bot.chat(`/boop ${this.getArgs(message)[0]}`);
       await delay(690);
       bot.chat(`/msg ${this.getArgs(message)[0]} ${username} Booped You!`);
       await delay(690);
-      this.send(`Booped ${this.getArgs(message)[0]}!`, officer);
+      this.send(`Booped ${this.getArgs(message)[0]}!`);
       this.isOnCooldown = true;
       // CREDITS: @jaxieflaxie for finding this cooldown reset
       setTimeout(() => {
@@ -51,7 +51,7 @@ class BoopCommand extends minecraftCommand {
       }, 30000);
       this.isOnCooldown = false;
     } catch (error) {
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 }

src/minecraft/commands/calculateCommand.js

@@ -17,18 +17,18 @@ class CalculateCommand extends minecraftCommand {
     ];
   }
 
-  onCommand(username, message, officer) {
+  onCommand(username, message) {
     try {
       const calculation = message.replace(/[^-()\d/*+.]/g, "");
       const answer = eval(calculation);
 
       if (answer === Infinity) {
-        return this.send("Something went wrong.. Somehow you broke it (the answer was infinity)", officer);
+        return this.send("Something went wrong.. Somehow you broke it (the answer was infinity)");
       }
 
-      this.send(`${calculation} = ${formatNumber(answer)} (${answer.toLocaleString()})`, officer);
+      this.send(`${calculation} = ${formatNumber(answer)} (${answer.toLocaleString()})`);
     } catch (error) {
-      this.send(`[ERROR] ${error}`, officer);
+      this.send(`[ERROR] ${error}`);
     }
   }
 }