improve code

MiraBellierr · Mar 2, 2024 · 7053e94 · 7053e94
1 parent e7b5796
commit 7053e94
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 56 deletions.
diff --git a/src/commands/rpg/equip.js b/src/commands/rpg/equip.js
@@ -2,6 +2,7 @@ const schemas = require("../../database/schemas");
 const Discord = require("discord.js");
 const constants = require("../../utils/constants");
 const { camelCaseToNormal } = require("../../utils/utils");
+const characters = require("../../database/json/characters.json");
 
 module.exports = {
   name: "equip",
@@ -27,7 +28,7 @@ module.exports = {
           name: message.author.username,
           iconURL: message.author.displayAvatarURL(),
         })
-        .setThumbnail(character.get("img"))
+        .setThumbnail(characters[character.get("img")].image)
         .setColor("#0099ff")
         .setTitle("Equipped Equipments")
         .setDescription(

diff --git a/src/commands/rpg/image.js b/src/commands/rpg/image.js
@@ -50,15 +50,12 @@ module.exports = {
       const name = args.join(" ");
       const images = JSON.parse(userCharacter.get("images"));
 
-      function searchCharacterByName(name) {
-        const searchResults = [];
-        for (const key in characters) {
-          const character = characters[key];
-          if (character.name.toLowerCase() === name.toLowerCase()) {
-            searchResults.push(key);
-          }
-        }
-        return searchResults;
+      function searchCharacterByName(searchname) {
+        return Object.entries(characters)
+          .filter(([_, { name }]) =>
+            name.toLowerCase().includes(searchname.toLowerCase()),
+          )
+          .map(([id]) => id);
       }
 
       const results = searchCharacterByName(name);
@@ -70,12 +67,7 @@ module.exports = {
       }
 
       function findFirstCommonElement(array1, array2) {
-        for (let i = 0; i < array1.length; i++) {
-          if (array2.includes(array1[i])) {
-            return array1[i];
-          }
-        }
-        return null;
+        return array1.find((id) => array2.includes(id));
       }
 
       const result = findFirstCommonElement(results, images);

diff --git a/src/commands/rpg/profile.js b/src/commands/rpg/profile.js
@@ -74,46 +74,31 @@ module.exports = {
             equipments.weapons.equipped
               ? equipments.weapons.equipped
                   .replace(/([A-Z])/g, " $1")
-                  .toLowerCase()
-                  .split(" ")
-                  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                  .join(" ")
+                  .replace(/\b\w/g, (e) => e.toUpperCase())
               : "None"
           }\n**• ${constants.assets.shield.emoji} Shield:** ${
             equipments.shields.equipped
               ? equipments.shields.equipped
                   .replace(/([A-Z])/g, " $1")
-                  .toLowerCase()
-                  .split(" ")
-                  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                  .join(" ")
+                  .replace(/\b\w/g, (e) => e.toUpperCase())
               : "None"
           }\n**• ${constants.assets.helmet.emoji} Helmet:** ${
             equipments.helmet.equipped
               ? equipments.helmet.equipped
                   .replace(/([A-Z])/g, " $1")
-                  .toLowerCase()
-                  .split(" ")
-                  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                  .join(" ")
+                  .replace(/\b\w/g, (e) => e.toUpperCase())
               : "None"
           }\n**• ${constants.assets.armor.emoji} Armor:** ${
             equipments.armor.equipped
               ? equipments.armor.equipped
                   .replace(/([A-Z])/g, " $1")
-                  .toLowerCase()
-                  .split(" ")
-                  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                  .join(" ")
+                  .replace(/\b\w/g, (e) => e.toUpperCase())
               : "None"
           }\n**• ${constants.assets.gloves.emoji} Gloves:** ${
             equipments.gloves.equipped
               ? equipments.gloves.equipped
                   .replace(/([A-Z])/g, " $1")
-                  .toLowerCase()
-                  .split(" ")
-                  .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                  .join(" ")
+                  .replace(/\b\w/g, (e) => e.toUpperCase())
               : "None"
           }`,
           inline: true,
@@ -201,46 +186,31 @@ module.exports = {
               equipments.weapons.equipped
                 ? equipments.weapons.equipped
                     .replace(/([A-Z])/g, " $1")
-                    .toLowerCase()
-                    .split(" ")
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(" ")
+                    .replace(/\b\w/g, (e) => e.toUpperCase())
                 : "None"
             }\n**• ${constants.assets.shield.emoji} Shield:** ${
               equipments.shields.equipped
                 ? equipments.shields.equipped
                     .replace(/([A-Z])/g, " $1")
-                    .toLowerCase()
-                    .split(" ")
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(" ")
+                    .replace(/\b\w/g, (e) => e.toUpperCase())
                 : "None"
             }\n**• ${constants.assets.helmet.emoji} Helmet:** ${
               equipments.helmet.equipped
                 ? equipments.helmet.equipped
                     .replace(/([A-Z])/g, " $1")
-                    .toLowerCase()
-                    .split(" ")
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(" ")
+                    .replace(/\b\w/g, (e) => e.toUpperCase())
                 : "None"
             }\n**• ${constants.assets.armor.emoji} Armor:** ${
               equipments.armor.equipped
                 ? equipments.armor.equipped
                     .replace(/([A-Z])/g, " $1")
-                    .toLowerCase()
-                    .split(" ")
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(" ")
+                    .replace(/\b\w/g, (e) => e.toUpperCase())
                 : "None"
             }\n**• ${constants.assets.gloves.emoji} Gloves:** ${
               equipments.gloves.equipped
                 ? equipments.gloves.equipped
                     .replace(/([A-Z])/g, " $1")
-                    .toLowerCase()
-                    .split(" ")
-                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-                    .join(" ")
+                    .replace(/\b\w/g, (e) => e.toUpperCase())
                 : "None"
             }`,
             inline: true,