xernerx 3.1.3 → 3.2.0

package/README.md

@@ -13,7 +13,7 @@ Xernerx is a class based discord.js framework. \[BETA\]
 > - Message command handles
 > - Webhook handler for Top.gg
 
-You can checkout the docs [here](https://github.com/TheDummi/xernerx/blob/master/docs/docs.md)
+You can checkout the docs [here](https://thedummi.github.io/xernerx/home.html)
 
 ## Notes
 

package/dist/build/ContextCommand.d.ts

@@ -7,7 +7,6 @@ import { XernerxClient } from "../main.js";
  * @param {ContextCommandOptions} options - The command options.
  */
 export declare class ContextCommand {
-    #private;
     id: string;
     data: ContextMenuCommandBuilder;
     description?: string;

package/dist/build/ContextCommand.js

@@ -1,5 +1,6 @@
 import { ContextMenuCommandBuilder, } from "discord.js";
 import { s } from "@sapphire/shapeshift";
+import { XernerxClient } from "../main.js";
 /**
  * @description The command builder for context commands.
  * @param {String} id - The unique ID of the command.
@@ -27,7 +28,7 @@ export class ContextCommand {
         if (options.name)
             this.data.setName(options.name);
         if (options.type)
-            this.data.setType(this.#types(options.type));
+            this.data.setType(options.type);
         if (options.defaultMemberPermissions)
             this.data.setDefaultMemberPermissions(options.defaultMemberPermissions);
         if (options.DMPermission)
@@ -66,7 +67,7 @@ export class ContextCommand {
         this.userPermissions = options.userPermissions;
         this.clientPermissions = options.clientPermissions;
         this.defer = options.defer;
-        this.client = {};
+        this.client = XernerxClient;
         this.conditions = this.conditions;
         this.exec = this.exec;
     }
@@ -80,11 +81,4 @@ export class ContextCommand {
      * @description Make your custom command here.
      */
     async exec(interaction) { }
-    #types(type) {
-        if (String(type)?.toLowerCase() === "message")
-            type = 3;
-        if (String(type)?.toLowerCase() === "user")
-            type = 2;
-        return type;
-    }
 }

package/dist/build/Event.js

@@ -1,4 +1,5 @@
 import { s } from "@sapphire/shapeshift";
+import { XernerxClient } from "../main.js";
 /**
  * @description - The event builder for any events.
  * @param {String} id - The unique ID of the event.
@@ -23,7 +24,7 @@ export class Event {
         this.emitter = options.emitter || "client";
         this.type = options.type || "discord";
         this.once = options.once || false;
-        this.client = {};
+        this.client = XernerxClient;
         this.run = this.run;
     }
     async run() {

package/dist/build/Inhibitor.js

@@ -1,4 +1,5 @@
 import { s } from "@sapphire/shapeshift";
+import { XernerxClient } from "../main.js";
 /**
  * @description - The inhibitor builder for inhibitors.
  * @param {String} id - The unique ID of the inhibitor.
@@ -17,7 +18,7 @@ export class Inhibitor {
         }).parse(options);
         this.name = options.name;
         this.type = options.type;
-        this.client = {};
+        this.client = XernerxClient;
         this.check = this.check;
     }
     async check() { }

package/dist/build/MessageCommand.js

@@ -1,4 +1,5 @@
 import { s } from "@sapphire/shapeshift";
+import { XernerxClient } from "../main.js";
 /**
  * @description - The command builder for message commands.
  * @param {String} id - The unique ID of the command.
@@ -62,7 +63,7 @@ export class MessageCommand {
         this.userPermissions = options.userPermissions || [];
         this.clientPermissions = options.clientPermissions || [];
         this.args = options.args;
-        this.client = {};
+        this.client = XernerxClient;
         this.conditions = this.conditions;
         this.exec = this.exec;
     }

package/dist/build/SlashCommand.js

@@ -1,5 +1,6 @@
 import { SlashCommandBuilder, SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, } from "discord.js";
 import { s } from "@sapphire/shapeshift";
+import { XernerxClient } from "../main.js";
 import XernerxError from "../tools/XernerxError.js";
 /**
  * @description - The command builder for slash commands.
@@ -69,7 +70,7 @@ export class SlashCommand {
         this.userPermissions = options.userPermissions;
         this.clientPermissions = options.clientPermissions;
         this.defer = options.defer;
-        this.client = {};
+        this.client = XernerxClient;
         this.conditions = this.conditions;
         this.exec = this.exec;
     }

package/dist/client/XernerxClient.d.ts

@@ -1,6 +1,6 @@
 import { Client, Collection } from "discord.js";
 import { ClientUtil } from "../utils/ClientUtil.js";
-import { DiscordOptions, ClientOptions, Commands, Cache, Modules, HandlerOptions } from "../interfaces/ClientInterfaces.js";
+import { DiscordOptions, ClientOptions, Commands, Cache, Modules, HandlerOptions, ExtensionOptions } from "../interfaces/ClientInterfaces.js";
 /**
  * @description - The Client.
  * @param {DiscordOptions} discordOptions - The options for discord.js.
@@ -15,8 +15,10 @@ export default class XernerxClient extends Client {
     util: ClientUtil;
     handlerOptions: HandlerOptions;
     events: Collection<string, object>;
+    extensions: Record<string, object>;
     inhibitors: Collection<string, object>;
     config: object;
     constructor(discordOptions: DiscordOptions, clientOptions: ClientOptions, config?: object);
     register(token: string): void;
+    loadExtensions(options: ExtensionOptions): Promise<void>;
 }

package/dist/client/XernerxClient.js

@@ -6,6 +6,7 @@ import InhibitorHandler from "../handlers/InhibitorHandler.js";
 import { ClientUtil } from "../utils/ClientUtil.js";
 import { Style } from "dumfunctions";
 import WebhookHandler from "../handlers/WebhookHandler.js";
+import Extensions from "../models/Extensions.js";
 /**
  * @description - The Client.
  * @param {DiscordOptions} discordOptions - The options for discord.js.
@@ -20,6 +21,7 @@ export default class XernerxClient extends Client {
     util;
     handlerOptions;
     events;
+    extensions;
     inhibitors;
     config;
     constructor(discordOptions, clientOptions, config) {
@@ -59,6 +61,7 @@ export default class XernerxClient extends Client {
             inhibitorHandler: new InhibitorHandler(this),
             webhookHandler: new WebhookHandler(this),
         };
+        this.extensions = {};
         this.util = new ClientUtil(this);
         this.handlerOptions = {};
         if (this.settings.logging) {
@@ -67,8 +70,13 @@ export default class XernerxClient extends Client {
                 console.info(Style.log(`Xernerx | ${client.user.tag} signed in watching ${size} server${size > 1 ? "s" : ""}. ${(this.handlerOptions.slash || this.handlerOptions.context)?.guildId ? `Using ${(await this.guilds.fetch((this.handlerOptions.slash || this.handlerOptions.context)?.guildId || "0")).name} as local guild.` : ""}`, { color: Style.TextColor.Purple }));
             });
         }
+        this.register = this.register;
     }
     register(token) {
         this.login(token);
     }
+    loadExtensions(options) {
+        const extensions = new Extensions(this);
+        return extensions.load(options.extensions, options.logging || false);
+    }
 }

package/dist/interfaces/ClientInterfaces.d.ts

@@ -58,3 +58,7 @@ export interface Modules {
     inhibitorHandler: InhibitorHandler;
     webhookHandler: WebhookHandler;
 }
+export interface ExtensionOptions {
+    extensions: Array<any>;
+    logging?: boolean;
+}

package/dist/interfaces/CommandInterfaces.d.ts

@@ -1,4 +1,5 @@
 import { ChannelType, ContextMenuCommandType } from "discord.js";
+import { ContextCommandType } from "../types/Types.js";
 export interface MessageCommandOptions {
     name: string;
     regex?: string;
@@ -21,13 +22,12 @@ export interface MessageCommandOptions {
 }
 export interface ContextCommandOptions {
     name: string;
-    type: ContextMenuCommandType | number;
+    type: ContextMenuCommandType | number | ContextCommandType;
     description?: string;
     info?: string;
     category?: string;
     owner?: boolean;
     channelType?: ChannelType;
-    separator?: string;
     cooldown?: number;
     ignoreOwner?: boolean;
     channels?: string[];

package/dist/main.d.ts

@@ -6,7 +6,7 @@ import { Inhibitor } from "./build/Inhibitor.js";
 import { MessageCommand } from "./build/MessageCommand.js";
 import { ContextCommand } from "./build/ContextCommand.js";
 import { SlashCommand } from "./build/SlashCommand.js";
-import { CommandType, EventEmitterType } from "./types/Types.js";
+import { CommandType, EventEmitterType, ContextCommandType } from "./types/Types.js";
 import { InhibitorType } from "./types/InhibitorTypes.js";
 declare const version: string;
 declare const _default: {
@@ -81,6 +81,7 @@ declare const _default: {
     CommandType: typeof CommandType;
     EventEmitterType: typeof EventEmitterType;
     InhibitorType: typeof InhibitorType;
+    ContextCommandType: typeof ContextCommandType;
     Event: typeof Event;
     MessageCommand: typeof MessageCommand;
     ContextCommand: typeof ContextCommand;
@@ -89,4 +90,4 @@ declare const _default: {
     version: string;
 };
 export default _default;
-export { Discord, DumFunctions, XernerxClient, CommandType, EventEmitterType, InhibitorType, Event, MessageCommand, ContextCommand, SlashCommand, Inhibitor, version, };
+export { Discord, DumFunctions, XernerxClient, CommandType, EventEmitterType, InhibitorType, ContextCommandType, Event, MessageCommand, ContextCommand, SlashCommand, Inhibitor, version, };

package/dist/main.js

@@ -6,9 +6,9 @@ import { Inhibitor } from "./build/Inhibitor.js";
 import { MessageCommand } from "./build/MessageCommand.js";
 import { ContextCommand } from "./build/ContextCommand.js";
 import { SlashCommand } from "./build/SlashCommand.js";
-import { CommandType, EventEmitterType } from "./types/Types.js";
+import { CommandType, EventEmitterType, ContextCommandType } from "./types/Types.js";
 import { InhibitorType } from "./types/InhibitorTypes.js";
-const version = "3.1.1";
+const version = "3.1.4";
 export default {
     // Imported methods
     Discord,
@@ -20,6 +20,7 @@ export default {
     CommandType,
     EventEmitterType,
     InhibitorType,
+    ContextCommandType,
     // Builds
     Event,
     MessageCommand,
@@ -35,7 +36,7 @@ Discord, DumFunctions,
 // Client
 XernerxClient, 
 // Types
-CommandType, EventEmitterType, InhibitorType, 
+CommandType, EventEmitterType, InhibitorType, ContextCommandType, 
 // Builds
 Event, MessageCommand, ContextCommand, SlashCommand, Inhibitor, 
 // Constants

package/dist/models/CommandValidations.js

@@ -15,25 +15,25 @@ export default function commandValidation(action, command, client, res = false)
         return true;
     else if (command.owner && !client.util.isOwner(user.id)) {
         res = true;
-        emit(client, action, "Not an owner", client.settings.ownerId);
+        emit(client, action, command, "Not an owner", client.settings.ownerId);
     }
     else if (command.channelType?.length > 0 || command.channelType) {
         if (!Array.isArray(command.channelType))
             command.channelType = [command.channelType];
         if (!command?.channelType?.includes(action.channel?.type)) {
             res = true;
-            emit(client, action, "Not the correct channel", command.channelType);
+            emit(client, action, command, "Not the correct channel", command.channelType);
         }
     }
     else if (command.channels?.length > 0 &&
         !command.channels.includes(action.channel?.id)) {
         res = true;
-        emit(client, action, "Not a whitelisted channel", command.channels);
+        emit(client, action, command, "Not a whitelisted channel", command.channels);
     }
     else if (command.guilds?.length > 0 &&
         !command.guilds.includes(action.guild?.id)) {
         res = true;
-        emit(client, action, "Not a whitelisted guild", command.guilds);
+        emit(client, action, command, "Not a whitelisted guild", command.guilds);
     }
     else if (action?.guild &&
         (command.userPermissions || client.settings.userPermissions)) {
@@ -47,7 +47,7 @@ export default function commandValidation(action, command, client, res = false)
             });
         if (missing.length > 0) {
             res = true;
-            emit(client, action, "Missing User Permissions", missing);
+            emit(client, action, command, "Missing User Permissions", missing);
         }
     }
     else if (action?.guild &&
@@ -62,13 +62,13 @@ export default function commandValidation(action, command, client, res = false)
             });
         if (missing.length > 0) {
             res = true;
-            emit(client, action, "Missing Client Permissions", missing);
+            emit(client, action, command, "Missing Client Permissions", missing);
         }
     }
     return res;
 }
-function emit(client, action, reason, extra) {
-    return client.emit("commandBlock", action, reason, extra);
+function emit(client, action, command, reason, extra) {
+    return client.emit("commandBlock", action, command, reason, extra);
 }
 function inCooldown(user, client, command, action) {
     let res = false, downs = {};

package/dist/models/Events.js

@@ -77,7 +77,7 @@ export class MessageCommandEvents {
                             this.client.emit("commandRun", message, cmd);
                         }
                         catch (error) {
-                            return this.client.emit("commandError", message, error);
+                            return this.client.emit("commandError", message, error, cmd);
                         }
                     }
                 });
@@ -154,7 +154,7 @@ export class MessageCommandEvents {
                             this.client.emit("commandRun", message, cmd);
                         }
                         catch (error) {
-                            return this.client.emit("commandError", message, error);
+                            return this.client.emit("commandError", message, error, cmd);
                         }
                     }
                 });
@@ -223,7 +223,7 @@ export class SlashCommandEvents {
                         this.client.emit("commandRun", interaction, command);
                     }
                     catch (error) {
-                        this.client.emit("commandError", interaction, error);
+                        this.client.emit("commandError", interaction, error, command);
                     }
                 }
             }
@@ -268,7 +268,7 @@ export class ContextCommandEvents {
                         this.client.emit("commandRun", interaction, command);
                     }
                     catch (error) {
-                        this.client.emit("commandError", interaction, error);
+                        this.client.emit("commandError", interaction, error, command);
                     }
                 }
             }

package/dist/models/Extensions.d.ts

@@ -0,0 +1,6 @@
+import { XernerxClient } from "../main.js";
+export default class Extensions {
+    client: XernerxClient;
+    constructor(client: XernerxClient);
+    load(extensions: Array<any>, logging?: boolean): Promise<void>;
+}

package/dist/models/Extensions.js

@@ -0,0 +1,16 @@
+import { Style } from "dumfunctions";
+export default class Extensions {
+    client;
+    constructor(client) {
+        this.client = client;
+    }
+    async load(extensions, logging = false) {
+        const exts = [];
+        extensions.map(extension => {
+            this.client.extensions[extension.name] = new extension(this.client, logging);
+            exts.push(extension.name);
+        });
+        if (logging)
+            console.info(Style.log(`Xernerx | Loaded ${exts.length} extensions: ${exts.join(', ')}`, { color: Style.TextColor.Cyan }));
+    }
+}

package/dist/models/Functions.d.ts

@@ -1 +1 @@
-export declare function logStyle(text: string, type: string, color: string): string | undefined;
+export {};

package/dist/models/Functions.js

@@ -1,30 +1 @@
-export function logStyle(text, type, color) {
-    if (type.toLowerCase() == "text") {
-        if (color.toLowerCase() == "red")
-            return `\u001b[0;31m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "green")
-            return `\u001b[0;32m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "yellow")
-            return `\u001b[0;33m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "blue")
-            return `\u001b[0;34m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "purple")
-            return `\u001b[0;35m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "cyan")
-            return `\u001b[0;36m${text}\u001b[0;0m`;
-    }
-    if (type.toLowerCase() == `background`) {
-        if (color.toLowerCase() == "red")
-            return `\u001b[0;41m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "green")
-            return `\u001b[0;42m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "yellow")
-            return `\u001b[0;43m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "blue")
-            return `\u001b[0;44m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "purple")
-            return `\u001b[0;45m${text}\u001b[0;0m`;
-        if (color.toLowerCase() == "cyan")
-            return `\u001b[0;46m${text}\u001b[0;0m`;
-    }
-}
+export {};

package/dist/types/Types.d.ts

@@ -9,6 +9,10 @@ export declare enum CommandType {
     SlashCommand = "SlashCommand",
     ContextCommand = "ContextCommand"
 }
+export declare enum ContextCommandType {
+    Message = 3,
+    User = 2
+}
 export declare enum EventEmitterType {
     Client = "client",
     Rest = "rest",

package/dist/types/Types.js

@@ -9,6 +9,11 @@ export var CommandType;
     CommandType["SlashCommand"] = "SlashCommand";
     CommandType["ContextCommand"] = "ContextCommand";
 })(CommandType = CommandType || (CommandType = {}));
+export var ContextCommandType;
+(function (ContextCommandType) {
+    ContextCommandType[ContextCommandType["Message"] = 3] = "Message";
+    ContextCommandType[ContextCommandType["User"] = 2] = "User";
+})(ContextCommandType = ContextCommandType || (ContextCommandType = {}));
 export var EventEmitterType;
 (function (EventEmitterType) {
     EventEmitterType["Client"] = "client";

package/dist/utils/ClientUtil.js

@@ -3,6 +3,17 @@ export class ClientUtil {
     client;
     constructor(client) {
         this.client = client;
+        this.uptime = this.uptime;
+        this.getSubcommands = this.getSubcommands;
+        this.isOwner = this.isOwner;
+        this.getAllCommands = this.getAllCommands;
+        this.getAllMessageCommands = this.getAllMessageCommands;
+        this.getAllSlashCommands = this.getAllSlashCommands;
+        this.getAllContextCommands = this.getAllContextCommands;
+        this.setPresence = this.setPresence;
+        this.getCooldowns = this.getCooldowns;
+        this.getCooldownTimers = this.getCooldownTimers;
+        this.defer = this.defer;
     }
     uptime(timestamp) {
         if (!timestamp)

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "xernerx",
-	"version": "3.1.3",
+	"version": "3.2.0",
 	"description": "A bot framework for discord.js. [BETA]",
 	"main": "dist/main.js",
 	"scripts": {