refactor: rewrite roles

Author: DuckySoLucky

.eslintrc

@@ -12,8 +12,7 @@
   "globals": {
     "bot": true,
     "client": true,
-    "guild": true,
-    "imgurUrl": true
+    "guild": true
   },
   "rules": {
     "curly": ["warn", "multi-line", "consistent"],

config.example.json

@@ -98,27 +98,60 @@
     "token": "WEBSOCKET_TOKEN"
   },
   "verification": {
-    "enabled": false,
-    "verifiedRole": "VERIFIED_ROLE_ID",
-    "unverifiedRole": "UNVERIFIED_ROLE_ID",
-    "removeVerificationRole": true,
-    "guildMemberRole": "GUILD_MEMBER_ROLE_ID",
-    "autoUpdater": false,
-    "autoUpdaterInterval": 24,
-    "name": "{username}",
-    "levelRoles": [
-      {
-        "type": "bedwarsStar",
-        "requirement": 200,
-        "roleId": "DISCORD_ROLE_ID"
-      }
-    ],
-    "ranks": [
-      {
-        "name": "IN_GAME_RANK_NAME",
-        "roles": ["DISCORD_ROLE_ID"]
-      }
-    ]
+    "enabled": true,
+    "nickname": "{username}",
+    "roles": {
+      "verified": {
+        "enabled": false,
+        "roleId": "1003353024720277504"
+      },
+      "guildMember": {
+        "enabled": true,
+        "roleId": "600313217603993617"
+      },
+      "custom": [
+        {
+          "roleId": "1324671329458458665",
+          "requirements": [
+            {
+              "type": "bedwarsStar",
+              "value": 100
+            }
+          ]
+        },
+        {
+          "roleId": "1324671329458458665",
+          "requirements": [
+            {
+              "type": "guildRank",
+              "value": "Novice"
+            }
+          ]
+        },
+        {
+          "roleId": "1324671329458458665",
+          "requirements": [
+            {
+              "type": "guildRank",
+              "value": "Test"
+            }
+          ]
+        },
+        {
+          "roleId": "1324671329458458665",
+          "requirements": [
+            {
+              "type": "skyblockLevel",
+              "value": 15
+            }
+          ]
+        }
+      ]
+    },
+    "autoRoleUpdater": {
+      "enabled": true,
+      "interval": 24
+    }
   },
   "other": {
     "autoUpdater": true,

jsconfig.json

@@ -11,6 +11,7 @@
   "include": ["API/**/*", "types/**/*.d.ts", "src/minecraft/commands/*"],
   "globals": {
     "bot": "readonly",
-    "client": "readonly"
+    "client": "readonly",
+    "guild": "readonly"
   }
 }

messages.json

@@ -14,7 +14,7 @@
   "offlineInvite": "{username} was offline invited to the guild!",
   "guildMuteMessage": "Guild Chat has been muted for {time}!",
   "guildUnmuteMessage": "Guild Chat has been unmuted!",
-  "guildJoinMessage": "Welcome to the guild! Make sure to join our discord using /g discord! To view my commands run {prefix}help",
+  "guildJoinMessage": "Welcome to the guild! Make sure to join our discord using /g discord!",
   "userMuteMessage": "{username} has been muted for {time}!",
   "userUnmuteMessage": "{username} has been unmuted!",
   "setrankFailMessage": "{username} not found.",

src/contracts/embedHandler.js

@@ -32,6 +32,10 @@ class ErrorEmbed extends Embed {
 
     this.setAuthor({ name: "An Error has occurred" });
     this.setColor(15548997);
+    this.setFooter({
+      text: `by @duckysolucky | /help [command] for more information`,
+      iconURL: "https://imgur.com/tgwQJTX.png"
+    });
 
     this.setDescription(description);
   }
@@ -51,6 +55,10 @@ class SuccessEmbed extends Embed {
 
     this.setAuthor({ name: "Success" });
     this.setColor(5763719);
+    this.setFooter({
+      text: `by @duckysolucky | /help [command] for more information`,
+      iconURL: "https://imgur.com/tgwQJTX.png"
+    });
 
     this.setDescription(description);
   }

src/discord/CommandHandler.js

@@ -13,8 +13,14 @@ class CommandHandler {
 
     for (const file of commandFiles) {
       const command = require(`./commands/${file}`);
-      if (command.verificationCommand === true && config.verification.enabled === false) continue;
-      if (command.channelsCommand === true && config.statsChannels.enabled === false) continue;
+      if (command.verificationCommand === true && config.verification.enabled === false) {
+        continue;
+      }
+
+      if (command.channelsCommand === true && config.statsChannels.enabled === false) {
+        continue;
+      }
+
       commands.push(command);
     }
 

src/discord/DiscordManager.js

@@ -104,6 +104,7 @@ class DiscordManager extends CommunicationBridge {
       console.error(`Channel ${chat} not found!`);
       return;
     }
+
     if (username === bot.username && message.endsWith("Check Discord Bridge for image.")) {
       channel.send(imgurUrl);
       imgurUrl = "";
@@ -183,6 +184,10 @@ class DiscordManager extends CommunicationBridge {
     console.broadcast(message, "Event");
 
     channel = await this.stateHandler.getChannel(channel);
+    if (channel === undefined) {
+      console.log(`Channel ${channel} not found!`);
+    }
+
     channel.send({
       embeds: [
         {
@@ -197,6 +202,11 @@ class DiscordManager extends CommunicationBridge {
     console.broadcast(message, "Event");
 
     channel = await this.stateHandler.getChannel(channel);
+    if (channel === undefined) {
+      console.log(`Channel ${channel} not found!`);
+      return;
+    }
+
     channel.send({
       embeds: [
         {
@@ -213,7 +223,13 @@ class DiscordManager extends CommunicationBridge {
 
   async onPlayerToggle({ fullMessage, username, message, color, channel }) {
     console.broadcast(message, "Event");
+
     channel = await this.stateHandler.getChannel(channel);
+    if (channel === undefined) {
+      console.log(`Channel ${channel} not found!`);
+      return;
+    }
+
     switch (config.discord.other.messageMode.toLowerCase()) {
       case "bot":
         channel.send({

src/discord/commands/forceUpdateChannelsCommand.js

@@ -1,8 +1,10 @@
 const HypixelDiscordChatBridgeError = require("../../contracts/errorHandler.js");
+const updateRolesCommand = require("./updateCommand.js");
+const fs = require("fs");
 
 module.exports = {
   name: "force-update",
-  description: "Update a user's roles",
+  description: "Update user's or everyone's roles",
   moderatorOnly: true,
   verificationCommand: true,
   requiresBot: true,
@@ -11,17 +13,44 @@ module.exports = {
       name: "user",
       description: "Discord User",
       type: 6,
-      required: true
+      required: false
+    },
+    {
+      name: "everyone",
+      description: "Update everyone's roles",
+      type: 5,
+      required: false
     }
   ],
 
   execute: async (interaction) => {
+    const linkedData = fs.readFileSync("data/linked.json");
+    if (!linkedData) {
+      throw new HypixelDiscordChatBridgeError("The linked data file does not exist. Please contact an administrator.");
+    }
+
+    const linked = JSON.parse(linkedData.toString("utf8"));
+    if (!linked) {
+      throw new HypixelDiscordChatBridgeError("The linked data file is malformed. Please contact an administrator.");
+    }
+
     const user = interaction.options.getUser("user");
-    const updateRolesCommand = require("./updateCommand.js");
-    if (updateRolesCommand === undefined) {
-      throw new HypixelDiscordChatBridgeError("The update command does not exist. Please contact an administrator.");
+    const everyone = interaction.options.getBoolean("everyone");
+    if (!user && !everyone) {
+      throw new HypixelDiscordChatBridgeError("You must specify a user or everyone.");
     }
 
-    await updateRolesCommand.execute(interaction, user);
+    if (user && everyone) {
+      throw new HypixelDiscordChatBridgeError("You cannot specify both user and everyone.");
+    }
+
+    if (user) {
+      await updateRolesCommand.execute(interaction, { discordId: user.id });
+    }
+
+    const discordIds = Object.values(linked);
+    for (const discordId of discordIds) {
+      await updateRolesCommand.execute(interaction, { discordId });
+    }
   }
 };