fix(inactivity): way that verified users are handled

Author: Kathund

config.example.json

@@ -117,7 +117,8 @@
     },
     "inactivity": {
       "enabled": false,
-      "channel": "INACTIVITY_LOG_CHANNEL"
+      "channel": "INACTIVITY_LOG_CHANNEL",
+      "maxInactivityTime": 30
     }
   },
   "other": {

src/discord/commands/gexpCheckCommand.js

@@ -29,7 +29,7 @@ module.exports = {
       throw new HypixelDiscordChatBridgeError("The linked data file does not exist. Please contact an administrator.");
     }
 
-    const linked = JSON.parse(linkedData);
+    const linked = JSON.parse(linkedData.toString());
     if (!linked) {
       throw new HypixelDiscordChatBridgeError("The linked data file is malformed. Please contact an administrator.");
     }
@@ -65,13 +65,13 @@ module.exports = {
       await interaction.editReply({ embeds: [progressEmbed] });
 
       const username = await getUsername(member.uuid);
-      const linkedUser = Object.keys(linked).find((key) => linked[key] === member.uuid);
+      const linkedUser = Object.keys(linked).find((value) => value === member.uuid);
       if (linkedUser === undefined) {
         skippedString += `${username} » User not verified | ${member.weeklyExperience.toLocaleString()}\n`;
         continue;
       }
 
-      const inactive = Object.keys(inactivity).find((key) => inactivity[key].uuid === member.uuid);
+      const inactive = Object.keys(inactivity).find((value) => value === member.uuid);
       if (inactive) {
         inactiveString += `${username} » Member Inactive | ${inactivity[inactive].reason}`;
         continue;

src/discord/commands/inactivityCommand.js

@@ -32,11 +32,17 @@ async function handleInactivitySubmit(interaction) {
     throw new HypixelDiscordChatBridgeError("The linked data file does not exist. Please contact an administrator.");
   }
 
-  const linked = JSON.parse(linkedData);
+  const linked = JSON.parse(linkedData.toString());
   if (!linked) {
     throw new HypixelDiscordChatBridgeError("The linked data file is malformed. Please contact an administrator.");
   }
 
+  const uuid = Object.entries(linked).find(([, value]) => value === interaction.user.id)?.[0];
+  if (!uuid) {
+    throw new HypixelDiscordChatBridgeError("You are not linked to a Minecraft account.");
+  }
+  const username = await getUsername(uuid);
+
   const inactivityData = readFileSync("data/inactivity.json");
   if (!inactivityData) {
     throw new HypixelDiscordChatBridgeError("The inactivity data file does not exist. Please contact an administrator.");
@@ -47,22 +53,26 @@ async function handleInactivitySubmit(interaction) {
     throw new HypixelDiscordChatBridgeError("The inactivity data file is malformed. Please contact an administrator.");
   }
 
-  if (inactivity[interaction.user.id]) {
+  if (inactivity[uuid]) {
     const embed = new Embed()
       .setTitle("Inactivity Failed")
-      .setDescription(`You are already inactive until <t:${inactivity[interaction.user.id].expire}:F> (<t:${inactivity[interaction.user.id].expire}:R>)`)
+      .setDescription(`You are already inactive until <t:${inactivity[uuid].expire}:F> (<t:${inactivity[uuid].expire}:R>)`)
       .setFooter({
         text: `by @.kathund | /help [command] for more information`,
         iconURL: "https://i.imgur.com/uUuZx2E.png"
       });
-    return await interaction.reply({ embeds: [embed] });
+    return await interaction.followUp({ embeds: [embed] });
   }
 
-  const uuid = linked[interaction.user.id];
-  const username = await getUsername(uuid);
-
   const time = Math.floor(ms(interaction.fields.getTextInputValue("inactivityTime")) / 1000);
   if (isNaN(time)) throw new HypixelDiscordChatBridgeError("Please input a valid time");
+
+  if (time > config.verification.inactivity.maxInactivityTime * 86400) {
+    throw new HypixelDiscordChatBridgeError(
+      `You can only request inactivity for ${config.verification.inactivity.maxInactivityTime} day(s) or less. Please contact an administrator if you need more time.`
+    );
+  }
+
   const reason = interaction.fields.getTextInputValue("inactivityReason") || "None";
   const expire = Math.floor(Date.now() / 1000) + time;
   const date = Math.floor(new Date().getTime() / 1000);
@@ -83,7 +93,7 @@ async function handleInactivitySubmit(interaction) {
     throw new HypixelDiscordChatBridgeError("Inactivity channel not found. Please contact an administrator.");
   }
 
-  inactivity[interaction.user.id] = { uuid, reason, expire };
+  inactivity[uuid] = { id: interaction.user.id, reason, expire };
   writeFileSync("data/inactivity.json", JSON.stringify(inactivity, null, 2));
   await channel.send({ embeds: [inactivityEmbed] });
   const inactivityResponse = new SuccessEmbed(`Inactivity request has been successfully sent to the guild staff.`).setFooter({
@@ -98,6 +108,7 @@ module.exports = {
   description: "Send an inactivity notice to the guild staff",
   inactivityCommand: true,
   guildOnly: true,
+  linkedOnly: true,
   verifiedOnly: true,
   handleInactivitySubmit,
   removeExpiredInactivity,

src/discord/events/interactionCreate.js

@@ -4,6 +4,7 @@ const { handleInactivitySubmit } = require("../commands/inactivityCommand.js");
 // eslint-disable-next-line no-unused-vars
 const { CommandInteraction } = require("discord.js");
 const config = require("../../../config.json");
+const { readFileSync } = require("fs");
 
 module.exports = {
   name: "interactionCreate",
@@ -37,10 +38,18 @@ module.exports = {
           throw new HypixelDiscordChatBridgeError("You don't have permission to use this command.");
         }
 
+        if (command.verifiedOnly === true && isVerifiedMember(interaction) === false) {
+          throw new HypixelDiscordChatBridgeError("You don't have permission to use this command.");
+        }
+
         if (command.guildOnly === true && isGuildMember(interaction) === false) {
           throw new HypixelDiscordChatBridgeError("You don't have permission to use this command.");
         }
 
+        if (command.linkedOnly === true && isLinkedMember(interaction) === false) {
+          throw new HypixelDiscordChatBridgeError("You are not linked to a Minecraft account.");
+        }
+
         if (command.requiresBot === true && isBotOnline() === false) {
           throw new HypixelDiscordChatBridgeError("Bot doesn't seem to be connected to Hypixel. Please try again.");
         }
@@ -112,7 +121,43 @@ function isGuildMember(interaction) {
   const user = interaction.member;
   const userRoles = user.roles.cache.map((role) => role.id);
 
-  if (config.discord.commands.checkPerms === true && !(userRoles.includes(config.verification.guildMemberRole) || config.discord.commands.users.includes(user.id))) {
+  if (
+    config.discord.commands.checkPerms === true &&
+    !(userRoles.includes(config.verification.roles.guildMember.roleId) || config.discord.commands.users.includes(user.id))
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+function isVerifiedMember(interaction) {
+  const user = interaction.member;
+  const userRoles = user.roles.cache.map((role) => role.id);
+
+  if (
+    config.discord.commands.checkPerms === true &&
+    !(userRoles.includes(config.verification.roles.verified.roleId) || config.discord.commands.users.includes(user.id))
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
+function isLinkedMember(interaction) {
+  const linkedData = 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());
+  if (!linked) {
+    throw new HypixelDiscordChatBridgeError("The linked data file is malformed. Please contact an administrator.");
+  }
+
+  const uuid = Object.entries(linked).find(([, value]) => value === interaction.user.id)?.[0];
+  if (!uuid) {
     return false;
   }