xernerx 3.4.2 → 3.5.0

package/dist/build/SlashCommandBuilder.js

@@ -1,118 +1,125 @@
-import Discord, { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder, } from 'discord.js';
-import { s } from '@sapphire/shapeshift';
-import XernerxError from '../tools/XernerxError.js';
-import XernerxClient from '../client/XernerxClient.js';
-/**
- * @description - The command builder for slash commands.
- * @param {String} id - The unique ID of the command.
- * @param {SlashCommandOptions} options - The command options.
- */
-export default class SlashCommandBuilder {
-    id;
-    data;
-    name;
-    description;
-    info;
-    category;
-    owner;
-    channelType;
-    separator;
-    cooldown;
-    ignoreOwner;
-    channels;
-    guilds;
-    userPermissions;
-    clientPermissions;
-    args;
-    subcommands;
-    groups;
-    defer;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        this.data = new Discord.SlashCommandBuilder().setName(options.name).setDescription(options.description);
-        if (options.args && options?.args?.length > 0) {
-            this.addArgs(this.data, options.args);
-        }
-        if (options.subcommands && options?.subcommands?.length > 0) {
-            this.addSubcommands(this.data, options.subcommands);
-        }
-        if (options.groups && options?.groups?.length > 0) {
-            this.addSubcommandGroups(options.groups);
-        }
-        s.object({
-            info: s.string.optional,
-            category: s.string.optional,
-            owner: s.boolean.optional,
-            channelType: s.union(s.number, s.array(s.number)).optional,
-            separator: s.string.optional,
-            cooldown: s.number.optional,
-            ignoreOwner: s.boolean.optional,
-            channels: s.array(s.string).optional,
-            guilds: s.array(s.string).optional,
-            userPermissions: s.array(s.bigint).optional,
-            clientPermissions: s.array(s.bigint).optional,
-            defer: s.object({
-                reply: s.boolean.optional,
-                ephemeral: s.boolean.optional,
-                fetchReply: s.boolean.optional,
-            }).optional,
-        });
-        this.name = options.name;
-        this.description = options.description;
-        this.info = options.info;
-        this.category = options.category;
-        this.owner = options.owner;
-        this.channelType = options.channelType;
-        this.separator = options.separator;
-        this.cooldown = options.cooldown;
-        this.ignoreOwner = options.ignoreOwner;
-        this.channels = options.channels;
-        this.guilds = options.guilds;
-        this.userPermissions = options.userPermissions;
-        this.clientPermissions = options.clientPermissions;
-        this.defer = options.defer;
-        this.client = XernerxClient;
-        this.conditions = this.conditions;
-        this.exec = this.exec;
-    }
-    async conditions(interaction) { }
-    async exec(interaction) { }
-    addArgs(command, args) {
-        const types = ['boolean', 'integer', 'number', 'string', 'user', 'role', 'channel', 'mentionable'];
-        for (const argument of args) {
-            if (!types.includes(argument.type.toLowerCase()))
-                throw new XernerxError(`Expected one of ${types.join(', ')}, received ${argument.type} instead.`);
-            let slashArgumentType = `${argument.type.slice(0, 1).toUpperCase()}${argument.type
-                .slice(1)
-                .toLowerCase()}`;
-            command[`add${slashArgumentType}Option`]((option) => {
-                option
-                    .setName(argument.name)
-                    .setDescription(argument.description)
-                    .setRequired(argument.required || false);
-                if (argument.choices)
-                    option.setChoices(...argument?.choices);
-                return option;
-            });
-        }
-    }
-    addSubcommands(method, subcommands) {
-        for (const subcommand of subcommands) {
-            let sub = new SlashCommandSubcommandBuilder().setName(subcommand.name).setDescription(subcommand.description);
-            if (subcommand.args?.length > 0)
-                this.addArgs(sub, subcommand.args);
-            method.addSubcommand(sub);
-        }
-    }
-    addSubcommandGroups(groups) {
-        for (const group of groups) {
-            let subcommandGroup = new SlashCommandSubcommandGroupBuilder()
-                .setName(group.name)
-                .setDescription(group.description);
-            if (group.subcommands?.length > 0)
-                this.addSubcommands(subcommandGroup, group.subcommands);
-            this.data.addSubcommandGroup(subcommandGroup);
-        }
-    }
-}
+import Discord, { SlashCommandSubcommandBuilder, SlashCommandSubcommandGroupBuilder } from 'discord.js';
+import { z } from 'zod';
+import XernerxError from '../tools/XernerxError.js';
+import XernerxClient from '../client/XernerxClient.js';
+/**
+ * @description - The command builder for slash commands.
+ * @param {String} id - The unique ID of the command.
+ * @param {SlashCommandOptions} options - The command options.
+ */
+export default class SlashCommandBuilder {
+    id;
+    data;
+    name;
+    description;
+    info;
+    category;
+    channelType;
+    cooldown;
+    ignore;
+    strict;
+    permissions;
+    args;
+    subcommands;
+    groups;
+    defer;
+    client;
+    constructor(id, options) {
+        this.id = id;
+        this.data = new Discord.SlashCommandBuilder().setName(options.name).setDescription(options.description);
+        if (options.args && options?.args?.length > 0) {
+            this.addArgs(this.data, options.args);
+        }
+        if (options.subcommands && options?.subcommands?.length > 0) {
+            this.addSubcommands(this.data, options.subcommands);
+        }
+        if (options.groups && options?.groups?.length > 0) {
+            this.addSubcommandGroups(options.groups);
+        }
+        z.object({
+            description: z.string(),
+            info: z.string(),
+            category: z.string(),
+            channelType: z.array(z.number()).or(z.number()),
+            cooldown: z.number(),
+            ignore: z.object({
+                owner: z.boolean(),
+                users: z.array(z.string()),
+                channels: z.array(z.string()),
+                guilds: z.array(z.string()),
+            }),
+            strict: z.object({
+                owner: z.boolean(),
+                users: z.array(z.string()),
+                channels: z.array(z.string()),
+                guilds: z.array(z.string()),
+            }),
+            permissions: z.object({
+                client: z.array(z.string()),
+                users: z.array(z.string()),
+                dm: z.boolean(),
+            }),
+            defer: z.object({
+                reply: z.boolean(),
+                ephemeral: z.boolean(),
+                fetch: z.boolean(),
+            }),
+        })
+            .deepPartial()
+            .parse(options);
+        this.name = options.name;
+        this.description = options.description;
+        this.info = options.info;
+        this.category = options.category;
+        this.channelType = options.channelType;
+        this.cooldown = options.cooldown;
+        this.ignore = options.ignore;
+        this.strict = options.strict;
+        this.permissions = options.permissions;
+        this.defer = options.defer;
+        this.client = XernerxClient;
+    }
+    /**
+     * TODO - update description
+     * @param interaction
+     */
+    async conditions(interaction) { }
+    /**
+     * TODO - update description
+     * @param interaction
+     */
+    async exec(interaction) { }
+    addArgs(command, args) {
+        const types = ['boolean', 'integer', 'number', 'string', 'user', 'role', 'channel', 'mentionable'];
+        for (const argument of args) {
+            if (!types.includes(argument.type.toLowerCase()))
+                throw new XernerxError(`Expected one of ${types.join(', ')}, received ${argument.type} instead.`);
+            let slashArgumentType = `${argument.type.slice(0, 1).toUpperCase()}${argument.type.slice(1).toLowerCase()}`;
+            command[`add${slashArgumentType}Option`]((option) => {
+                option
+                    .setName(argument.name)
+                    .setDescription(argument.description)
+                    .setRequired(argument.required || false);
+                if (argument.choices)
+                    option.setChoices(...argument?.choices);
+                return option;
+            });
+        }
+    }
+    addSubcommands(method, subcommands) {
+        for (const subcommand of subcommands) {
+            let sub = new SlashCommandSubcommandBuilder().setName(subcommand.name).setDescription(subcommand.description);
+            if (subcommand.args?.length > 0)
+                this.addArgs(sub, subcommand.args);
+            method.addSubcommand(sub);
+        }
+    }
+    addSubcommandGroups(groups) {
+        for (const group of groups) {
+            let subcommandGroup = new SlashCommandSubcommandGroupBuilder().setName(group.name).setDescription(group.description);
+            if (group.subcommands?.length > 0)
+                this.addSubcommands(subcommandGroup, group.subcommands);
+            this.data.addSubcommandGroup(subcommandGroup);
+        }
+    }
+}

package/dist/client/XernerxClient.js

@@ -1,81 +1,101 @@
-import { Client, Collection } from 'discord.js';
-import { s } from '@sapphire/shapeshift';
-import { Style } from 'dumfunctions';
-import { ClientUtil } from '../utils/ClientUtil.js';
-import CommandHandler from '../handlers/CommandHandler.js';
-import EventHandler from '../handlers/EventHandler.js';
-import InhibitorHandler from '../handlers/InhibitorHandler.js';
-import Extensions from '../models/Extensions.js';
-/**
- * @description - The Client.
- * @param {DiscordOptions} discordOptions - The options for discord.js.
- * @param {ClientOptions} clientOptions - The options for the Xernerx Client.
- * @extends {Client}
- */
-export default class XernerxClient extends Client {
-    settings;
-    commands;
-    cache;
-    modules;
-    util;
-    handlerOptions;
-    events;
-    extensions;
-    inhibitors;
-    config;
-    constructor(discordOptions, clientOptions, config) {
-        super(discordOptions);
-        this.settings = s
-            .object({
-            ownerId: s.union(s.array(s.string).unique, s.string).default([]),
-            clientPermissions: s.array(s.bigint).default([]),
-            userPermissions: s.array(s.bigint).default([]),
-            ignoreOwner: s.boolean.default(false),
-            logging: s.boolean.optional,
-            cooldown: s.object({
-                default: s.number.default(0),
-                cache: s.number.default(0),
-            }).optional,
-        })
-            .parse(clientOptions);
-        this.config = config || {};
-        this.commands = {
-            message: new Collection(),
-            slash: new Collection(),
-            context: new Collection(),
-        };
-        this.events = new Collection();
-        this.inhibitors = new Collection();
-        this.cache = {
-            messages: new Collection(),
-            cooldowns: new Collection(),
-            messageCommands: new Collection(),
-            slashCommands: new Collection(),
-            contextCommands: new Collection(),
-            commands: new Collection(),
-        };
-        this.modules = {
-            commandHandler: new CommandHandler(this),
-            eventHandler: new EventHandler(this),
-            inhibitorHandler: new InhibitorHandler(this),
-        };
-        this.extensions = {};
-        this.util = new ClientUtil(this);
-        this.handlerOptions = {};
-        if (this.settings.logging) {
-            this.once('ready', async (client) => {
-                const size = (await client.guilds.fetch()).size;
-                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 }));
-            });
-        }
-    }
-    register(token) {
-        this.login(token);
-    }
-    loadAllExtensions(options) {
-        const extensions = new Extensions(this);
-        return extensions.load(options.extensions, options.logging || false);
-    }
-}
+import { Client, Collection } from 'discord.js';
+import { z } from 'zod';
+import { Style } from 'dumfunctions';
+import { ClientUtil } from '../utils/ClientUtil.js';
+import CommandHandler from '../handlers/CommandHandler.js';
+import EventHandler from '../handlers/EventHandler.js';
+import InhibitorHandler from '../handlers/InhibitorHandler.js';
+import Extensions from '../models/Extensions.js';
+// TODO - Add commandNotFound as an event to the client.
+/**
+ * @description - The Client.
+ * @param {DiscordOptions} discordOptions - The options for discord.js.
+ * @param {ClientOptions} clientOptions - The options for the Xernerx Client.
+ * @extends {Client}
+ */
+export default class XernerxClient extends Client {
+    settings;
+    commands;
+    cache;
+    modules;
+    util;
+    handlerOptions;
+    events;
+    extensions;
+    inhibitors;
+    config;
+    constructor(discordOptions, clientOptions, config) {
+        super(discordOptions);
+        this.settings = z
+            .object({
+            ownerId: z.string().or(z.array(z.string())).default([]),
+            permissions: z
+                .object({
+                client: z.array(z.string()).default([]),
+                user: z.array(z.string()).default([]),
+                dm: z.boolean().default(false),
+            })
+                .optional(),
+            ignore: z
+                .object({
+                owner: z.boolean().default(false),
+                users: z.array(z.string()),
+                channels: z.array(z.string()),
+                guilds: z.array(z.string()),
+            })
+                .optional(),
+            log: z
+                .object({
+                ready: z.boolean().default(false),
+                error: z.boolean().default(false),
+            })
+                .optional(),
+            cooldown: z
+                .object({
+                command: z.number().default(0),
+                cache: z.number().default(0),
+            })
+                .optional(),
+        })
+            .parse(clientOptions);
+        this.config = config || {};
+        this.commands = {
+            message: new Collection(),
+            slash: new Collection(),
+            context: new Collection(),
+        };
+        this.events = new Collection();
+        this.inhibitors = new Collection();
+        this.cache = {
+            messages: new Collection(),
+            cooldowns: new Collection(),
+            messageCommands: new Collection(),
+            slashCommands: new Collection(),
+            contextCommands: new Collection(),
+            commands: new Collection(),
+        };
+        this.modules = {
+            commandHandler: new CommandHandler(this),
+            eventHandler: new EventHandler(this),
+            inhibitorHandler: new InhibitorHandler(this),
+        };
+        this.extensions = {};
+        this.util = new ClientUtil(this);
+        this.handlerOptions = {};
+        if (this.settings?.log?.ready) {
+            this.once('ready', async (client) => {
+                const size = (await client.guilds.fetch()).size;
+                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 }));
+            });
+        }
+    }
+    register(token) {
+        this.login(token);
+    }
+    loadAllExtensions(options) {
+        const extensions = new Extensions(this);
+        return extensions.load(options.extensions, options.logging || false);
+    }
+}

package/dist/handlers/CommandHandler.js

@@ -1,42 +1,42 @@
-import { Handler } from './Handler.js';
-import { CommandsDeploy, ContextCommandEvents, MessageCommandEvents, SlashCommandEvents } from '../models/Events.js';
-/**
- * @description - The command handler.
- * @param {XernerxClient} client - The XernerxClient.
- */
-export default class CommandHandler {
-    client;
-    handler;
-    constructor(client) {
-        this.client = client;
-        this.handler = new Handler(client);
-        new CommandsDeploy(this.client).deploy();
-    }
-    /**
-     * @description - The message command loader.
-     * @param {MessageCommandOptions} options - message command loader options.
-     */
-    loadAllMessageCommands(options) {
-        this.handler.loadAllMessageCommands(options);
-        const events = new MessageCommandEvents(this.client);
-        events.messageCreate();
-        events.messageUpdate();
-        events.messageDelete();
-    }
-    /**
-     * @description - The slash command loader.
-     * @param {SlashCommandOptions} options - slash command loader options.
-     */
-    loadAllSlashCommands(options) {
-        this.handler.loadAllSlashCommands(options);
-        new SlashCommandEvents(this.client).slashCreate();
-    }
-    /**
-     * @description - The context command loader.
-     * @param {ContextCommandOptions} options - context command loader options.
-     */
-    loadAllContextCommands(options) {
-        this.handler.loadAllContextCommands(options);
-        new ContextCommandEvents(this.client).contextCreate();
-    }
-}
+import { Handler } from './Handler.js';
+import { CommandsDeploy, ContextCommandEvents, MessageCommandEvents, SlashCommandEvents } from '../models/Events.js';
+/**
+ * @description - The command handler.
+ * @param {XernerxClient} client - The XernerxClient.
+ */
+export default class CommandHandler {
+    client;
+    handler;
+    constructor(client) {
+        this.client = client;
+        this.handler = new Handler(client);
+        new CommandsDeploy(this.client).deploy();
+    }
+    /**
+     * @description - The message command loader.
+     * @param {MessageCommandOptions} options - message command loader options.
+     */
+    loadAllMessageCommands(options) {
+        this.handler.loadAllMessageCommands(options);
+        const events = new MessageCommandEvents(this.client);
+        events.messageCreate();
+        events.messageUpdate();
+        events.messageDelete();
+    }
+    /**
+     * @description - The slash command loader.
+     * @param {SlashCommandOptions} options - slash command loader options.
+     */
+    loadAllSlashCommands(options) {
+        this.handler.loadAllSlashCommands(options);
+        new SlashCommandEvents(this.client).slashCreate();
+    }
+    /**
+     * @description - The context command loader.
+     * @param {ContextCommandOptions} options - context command loader options.
+     */
+    loadAllContextCommands(options) {
+        this.handler.loadAllContextCommands(options);
+        new ContextCommandEvents(this.client).contextCreate();
+    }
+}

package/dist/handlers/EventHandler.js

@@ -1,16 +1,16 @@
-import { Handler } from './Handler.js';
-export default class EventHandler {
-    client;
-    handler;
-    constructor(client) {
-        this.client = client;
-        this.handler = new Handler(client);
-    }
-    /**
-     * @description - The event loader
-     * @param {EventLoadOptions} options - message command options
-     */
-    loadAllEvents(options) {
-        return this.handler.loadAllEvents(options);
-    }
-}
+import { Handler } from './Handler.js';
+export default class EventHandler {
+    client;
+    handler;
+    constructor(client) {
+        this.client = client;
+        this.handler = new Handler(client);
+    }
+    /**
+     * @description - The event loader
+     * @param {EventLoadOptions} options - message command options
+     */
+    loadAllEvents(options) {
+        return this.handler.loadAllEvents(options);
+    }
+}