xernerx 2.6.0 → 2.6.3

package/main.js

@@ -12,9 +12,9 @@ const { Client } = require('./models/Client.js'),
     Discord = require('discord.js'),
     i18next = require('i18next');
 
-module.exports = {
+const exp = {
     // Client
-    Client,
+    XernerxClient: Client,
 
     // Handlers
     CommandHandler,
@@ -38,4 +38,10 @@ module.exports = {
 
     // Details
     version: pkg.version,
-} 
+}
+
+for (const [key, val] of Object.entries(Discord)) {
+    exp[key] = val;
+}
+
+module.exports = exp;

package/models/events/interactionCreate.js

@@ -23,7 +23,7 @@ class BuildInInteractionEvent extends Event {
             if (interaction.client.commands.interaction.has(interaction.commandName)) {
                 let command = interaction.client.commands.interaction.get(interaction.commandName);
 
-                if (inhibitorsValidation(interaction, command)) return;
+                if (await inhibitorsValidation(interaction, command)) return;
 
                 await this.defer(interaction, command);
 

package/models/events/messageCreate.js

@@ -42,7 +42,7 @@ class BuildInMessageEvent extends Event {
             if (message?.client?.settings?.prefix?.length <= 0) return;
 
             commands.filter(c => !c.regex).map(async command => {
-                command.prefix.map(prefix => {
+                command?.prefix?.map(prefix => {
                     this.commandCheck(message, prefix, command);
                 })
 
@@ -57,7 +57,7 @@ class BuildInMessageEvent extends Event {
         for (const alias of command.aliases) {
             if (message.content.split(/ +/)[0] !== prefix + alias) continue;
 
-            if (inhibitorsValidation(message, command)) break;
+            if (await inhibitorsValidation(message, command)) break;
 
             const args = await messageArgs({ message: message, command: command });
 

package/models/events/messageUpdate.js

@@ -44,7 +44,7 @@ class BuildInMessageUpdateEvent extends Event {
             if (!newMessage.client.data.messages[newMessage.id] === undefined) return;
 
             commands.filter(c => !c.regex).map(async command => {
-                command.prefix.map(prefix => {
+                command?.prefix?.map(prefix => {
                     this.commandCheck(newMessage, prefix, command);
                 })
 
@@ -59,7 +59,7 @@ class BuildInMessageUpdateEvent extends Event {
         for (const alias of command.aliases) {
             if (message.content.split(/ +/)[0] !== prefix + alias) continue;
 
-            if (inhibitorsValidation(message, command)) break;
+            if (await inhibitorsValidation(message, command)) break;
 
             const args = await messageArgs({ message: message, command: command });
 

package/models/utils/CommandValidation.js

@@ -58,13 +58,13 @@ module.exports = new class CommandValidation {
                 if (!event?.member?.permissions?.has(Discord.PermissionFlagsBits[toPascalCase(permission)])) missingPerms.push(toPascalCase(permission));
             }
 
-            if (missingPerms.length >= 1) {
+            if (missingPerms?.length >= 1) {
                 res = true;
                 return emit("missing user permissions", missingPerms);
             }
         }
 
-        if (event?.guild && command?.clientPermissions.length >= 1 || event.client.settings.clientPermissions.length >= 1) {
+        if (event?.guild && command?.clientPermissions?.length >= 1 || event?.client?.settings?.clientPermissions?.length >= 1) {
             let missingPerms = [];
 
             for (const permission of command?.clientPermissions) {

package/models/utils/InhibitorsValidation.js

@@ -1,36 +1,36 @@
 module.exports = new class InhibitorValidation {
-    inhibitorsValidation(event, command) {
+    async inhibitorsValidation(event, command) {
         let inhibited = {};
 
         if (event.client.inhibitors.has(command.runType)) {
             let inhibitor = event.client.inhibitors.get(command.runType);
 
-            inhibited[command.runType] = inhibitor.check(event);
+            inhibited[command.runType] = await inhibitor.check(event);
         }
 
         if (event.client.inhibitors.has("member")) {
 
             let inhibitor = event.client.inhibitors.get("member");
 
-            inhibited["member"] = inhibitor.check(event, event.member);
+            inhibited["member"] = await inhibitor.check(event, event.member);
         }
 
         if (event.client.inhibitors.has("guild")) {
             let inhibitor = event.client.inhibitors.get("guild");
 
-            inhibited["guild"] = inhibitor.check(event, event.guild);
+            inhibited["guild"] = await inhibitor.check(event, event.guild);
         }
 
         if (event.client.inhibitors.has("user")) {
             let inhibitor = event.client.inhibitors.get("user");
 
-            inhibited["user"] = inhibitor.check(event, event.user || event.author);
+            inhibited["user"] = await inhibitor.check(event, event.user || event.author);
         }
 
         if (event.client.inhibitors.has("channel")) {
             let inhibitor = event.client.inhibitors.get("channel");
 
-            inhibited["channel"] = inhibitor.check(event);
+            inhibited["channel"] = await inhibitor.check(event);
         }
 
         for (const inhibit of Object.values(inhibited)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "2.6.0",
+	"version": "2.6.3",
 	"description": "A bot framework for discord.js. [BETA]",
 	"main": "main.js",
 	"scripts": {