Merge branch 'main' of https://github.com/ewei068/pokestar

ewei068 · Dec 8, 2024 · 7ce9ab0 · 7ce9ab0
2 parents 8c5b600 + 5acd035
commit 7ce9ab0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -31,6 +31,7 @@ export default [
       "no-return-await": "off", // deprecated
       "no-restricted-syntax": "off", // TODO: enable but make better lol
       "no-underscore-dangle": "off", // Needed for mongo _id
+      "no-restricted-globals": "off", // globals work differently
       "guard-for-in": "off", // TODO: enable but make better lol
       "no-continue": "off", // doesn't seem to work properly
       "no-await-in-loop": "off", // TODO: use promise.all

diff --git a/src/commands/battle/partyRemove.js b/src/commands/battle/partyRemove.js
@@ -25,7 +25,7 @@ const partyRemove = async (user, option) => {
   const partyPokemon = trainer.data.party.pokemonIds;
 
   // if option is a number convert to number and use as position
-  if (!Number.isNaN(option)) {
+  if (!isNaN(option)) {
     const position = parseInt(option, 10);
     const index = position - 1;
 

diff --git a/src/commands/social/tradeAdd.js b/src/commands/social/tradeAdd.js
@@ -13,6 +13,7 @@ const { getIdFromNameOrId } = require("../../services/pokemon");
  * Adds the given pokemon via ID to the position in the given user's trade.
  * @param user user required for getting specific user's data.
  * @param pokemonId the Id of the pokemon the user wants to add to their trade
+ * @param money
  * @returns Error or message to send.
  */
 // tradeAdd sends off the relevent user, pokemonId and position to buildtradeAddSend from the trade.js dependency and waits for it to return.
@@ -30,7 +31,7 @@ const tradeAddMessageCommand = async (message) => {
   let money = 0;
   let pokemonId = null;
   // if parseInt money is NaN, then it will return null
-  if (!Number.isNaN(option)) {
+  if (!isNaN(option)) {
     money = parseInt(option, 10);
   } else {
     pokemonId = option;
@@ -49,7 +50,7 @@ const tradeAddSlashCommand = async (interaction) => {
   let money = 0;
   let pokemonId = null;
   // if parseInt money is NaN, then it will return null
-  if (!Number.isNaN(option)) {
+  if (!isNaN(option)) {
     money = parseInt(option, 10);
     await interaction.deferReply();
   } else {

diff --git a/src/commands/social/tradeRemove.js b/src/commands/social/tradeRemove.js
@@ -13,6 +13,7 @@ const { getIdFromNameOrId } = require("../../services/pokemon");
  * Adds the given pokemon via ID to the position in the given user's trade.
  * @param user user required for getting specific user's data.
  * @param pokemonId the Id of the pokemon the user wants to add to their trade
+ * @param money
  * @returns Error or message to send.
  */
 // tradeRemove sends off the relevent user, pokemonId and position to buildtradeRemoveSend from the trade.js dependency and waits for it to return.
@@ -32,7 +33,7 @@ const tradeRemoveMessageCommand = async (message) => {
 
   if (option === "ALL") {
     // pass
-  } else if (!Number.isNaN(option)) {
+  } else if (!isNaN(option)) {
     // if parseInt money is NaN, then it will return null
     money = parseInt(option, 10);
   } else {
@@ -55,7 +56,7 @@ const tradeRemoveSlashCommand = async (interaction) => {
   if (option === "ALL") {
     // pass
     await interaction.deferReply();
-  } else if (!Number.isNaN(option)) {
+  } else if (!isNaN(option)) {
     // if parseInt money is NaN, then it will return null
     money = parseInt(option, 10);
     await interaction.deferReply();

diff --git a/src/handlers/commandHandler.js b/src/handlers/commandHandler.js
@@ -166,7 +166,7 @@ const validateArgs = (command, args) => {
 
       // type check
       if (argConfig.type === "int") {
-        if (Number.isNaN(providedArg)) {
+        if (isNaN(providedArg)) {
           return false;
         }
       } else if (argConfig.type === "bool") {