Fixed help color (base 10, base 16 support)

Khaaz · May 6, 2019 · 89f655b · 89f655b
1 parent 3396168
commit 89f655b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/example/src/configs/templateConf.json b/example/src/configs/templateConf.json
@@ -1,7 +1,7 @@
 {
     "embed": {
         "colors": {
-            "help": "",
+            "help": "ffffff",
             "global": 4315874,
             "error": 15844367
         }

diff --git a/src/AxonClient.js b/src/AxonClient.js
@@ -736,9 +736,9 @@ class AxonClient extends EventEmitter {
             text: 'Runs with AxonCore',
         };
 
-        // eslint-disable-next-line no-nested-ternary
-        embed.color = isNaN(this.template.embed.colors.help)
-            ? this.template.embed.colors.help.length > 0 ? parseInt(this.template.embed.colors.help, 10) : null
+
+        embed.color = typeof this.template.embed.colors.help === 'string'
+            ? parseInt(this.template.embed.colors.help, 16) || null
             : this.template.embed.colors.help;
 
         let commandList = '';

diff --git a/src/Structures/Command.js b/src/Structures/Command.js
@@ -344,9 +344,8 @@ class Command extends Base {
             icon_url: this.bot.user.avatarURL,
         };
 
-        // eslint-disable-next-line no-nested-ternary
-        embed.color = isNaN(this.template.embed.colors.help)
-            ? this.template.embed.colors.help.length > 0 ? parseInt(this.template.embed.colors.help, 10) : null
+        embed.color = typeof this.template.embed.colors.help === 'string'
+            ? parseInt(this.template.embed.colors.help, 16) || null
             : this.template.embed.colors.help;
 
         embed.description = `**Description:** ${this.infos.description}\n`;