xernerx 3.5.1 → 3.6.0

package/dist/mjs/validators/CommandValidations.js

@@ -0,0 +1,169 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+const discord_js_1 = require('discord.js');
+const enums_js_1 = require('../types/enums.js');
+function getUser(from) {
+    if (from instanceof discord_js_1.Message) return from.author;
+    else return from.user;
+}
+function commandValidation(action, command, client, res = false) {
+    let user = getUser(action);
+    if (client.settings.ignore?.owner && client.util.isOwner(user.id)) return res;
+    else if (inCooldown(user, client, command, action)) return true;
+    else if (command.owner && !client.util.isOwner(user.id)) {
+        res = true;
+        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, command, 'Not the correct channel', command.channelType);
+        }
+    } else if (command.channels?.length > 0 && !command.channels.includes(action.channel?.id)) {
+        res = true;
+        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, command, 'Not a whitelisted guild', command.guilds);
+    } else if (command.channelType && command.channelType !== action.channel?.type) {
+        res = true;
+        emit(client, action, command, 'Not the correct type of channel', command.channelType);
+    } else if (action?.guild && (command.permissions?.user || client.settings.permissions?.user)) {
+        const permissions = command.permissions?.user || client?.settings?.permissions?.user?.push(...handlerPermissions(client, command.commandType, 'user')),
+            missing = [];
+        if (Array.isArray(permissions))
+            permissions.map((permission) => {
+                if (!(action.member?.permissions).has(permission)) {
+                    missing.push(permission);
+                }
+            });
+        if (missing.length > 0) {
+            res = true;
+            emit(client, action, command, 'Missing User Permissions', missing);
+        }
+    } else if (action?.guild && (command.permissions?.client || client.settings.permissions?.client)) {
+        const permissions = command.permissions?.client || client?.settings?.permissions?.client?.push(...handlerPermissions(client, command.commandType, 'client')),
+            missing = [];
+        if (Array.isArray(permissions))
+            permissions.map((permission) => {
+                if (!(action.member?.permissions).has(permission)) {
+                    missing.push(permission);
+                }
+            });
+        if (missing.length > 0) {
+            res = true;
+            emit(client, action, command, 'Missing Client Permissions', missing);
+        }
+    }
+    return res;
+}
+exports.default = commandValidation;
+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 = {};
+    const { cooldowns, messageCommands, slashCommands, contextCommands, commands } = client.cache;
+    if (command.commandType === enums_js_1.CommandType.MessageCommand && client.handlerOptions.message.cooldown) {
+        if (messageCommands.has(user.id)) {
+            const usr = messageCommands.get(user.id);
+            usr.timeRemaining = usr.endsAt - Date.now();
+            downs.message = usr;
+            res = true;
+        }
+        if (!messageCommands.has(user.id)) {
+            messageCommands.set(user.id, toCooldown(action, command, client.handlerOptions.message.cooldown, user.id));
+            setInterval(() => {
+                messageCommands.delete(user.id);
+            }, client.handlerOptions.message.cooldown);
+        }
+    }
+    if (command.commandType === enums_js_1.CommandType.SlashCommand && client.handlerOptions.slash.cooldown) {
+        if (slashCommands.has(user.id)) {
+            const usr = slashCommands.get(user.id);
+            usr.timeRemaining = usr.endsAt - Date.now();
+            downs.slash = usr;
+            res = true;
+        }
+        if (!slashCommands.has(user.id)) {
+            slashCommands.set(user.id, toCooldown(action, command, client.handlerOptions.slash.cooldown, user.id));
+            setInterval(() => {
+                slashCommands.delete(user.id);
+            }, client.handlerOptions.slash.cooldown);
+        }
+    }
+    if (command.commandType === enums_js_1.CommandType.ContextCommand && client.handlerOptions.context.cooldown) {
+        if (contextCommands.has(user.id)) {
+            const usr = contextCommands.get(user.id);
+            usr.timeRemaining = usr.endsAt - Date.now();
+            downs.context = usr;
+            res = true;
+        }
+        if (!contextCommands.has(user.id)) {
+            contextCommands.set(user.id, toCooldown(action, command, client.handlerOptions.context.cooldown, user.id));
+            setInterval(() => {
+                contextCommands.delete(user.id);
+            }, client.handlerOptions.context.cooldown);
+        }
+    }
+    if (client.settings?.cooldown?.default) {
+        if (cooldowns.has(user.id)) {
+            const usr = cooldowns.get(user.id);
+            usr.timeRemaining = usr.endsAt - Date.now();
+            downs.default = usr;
+            res = true;
+        }
+        if (!cooldowns.has(user.id)) {
+            cooldowns.set(user.id, toCooldown(action, command, client.settings.cooldown.default, user.id));
+            setInterval(() => {
+                cooldowns.delete(user.id);
+            }, client.settings.cooldown.default);
+        }
+    }
+    if (command.cooldown) {
+        const name = user.id + '-' + (command.data?.name || command?.name) + '-' + command.commandType;
+        if (commands.has(name)) {
+            const usr = commands.get(name);
+            usr.timeRemaining = usr.endsAt - Date.now();
+            downs.command = usr;
+            res = true;
+        }
+        if (!commands.has(name)) {
+            commands.set(name, toCooldown(action, command, command.cooldown, name));
+            setInterval(() => {
+                commands.delete(name);
+            }, command.cooldown);
+        }
+    }
+    if (Object.keys(downs).length > 0) client.emit('commandCooldown', action, command, downs);
+    return res;
+}
+function toCooldown(action, command, cooldown, name) {
+    let user = getUser(action);
+    return {
+        name,
+        id: user.id,
+        tag: user.tag,
+        commandType: command.commandType,
+        commandName: command?.data?.name || command?.name,
+        guildId: action?.guild?.id,
+        channelId: action?.channel?.id,
+        startsAt: Number(Date.now()),
+        endsAt: Number(Date.now()) + cooldown,
+    };
+}
+function handlerPermissions(client, commandType, type) {
+    let permissions = [];
+    if (commandType === enums_js_1.CommandType.MessageCommand) {
+        if (type === 'user') permissions = client.handlerOptions.message?.userPermissions || [];
+        else if (type === 'client') permissions = client.handlerOptions.message?.clientPermissions || [];
+    } else if (commandType === enums_js_1.CommandType.SlashCommand) {
+        if (type === 'user') permissions = client.handlerOptions.slash?.userPermissions || [];
+        else if (type === 'client') permissions = client.handlerOptions.slash?.clientPermissions || [];
+    } else if (commandType === enums_js_1.CommandType.ContextCommand) {
+        if (type === 'user') permissions = client.handlerOptions.context?.userPermissions || [];
+        else if (type === 'client') permissions = client.handlerOptions.context?.clientPermissions || [];
+    }
+    return permissions;
+}

package/dist/mjs/validators/InhibitorValidations.d.ts

@@ -0,0 +1,11 @@
+import XernerxClient from '../client/XernerxClient.js';
+import { XernerxInteraction, XernerxMessage } from '../types/types.js';
+export declare class InhibitorValidation {
+    client: XernerxClient;
+    action: XernerxMessage | XernerxInteraction;
+    command: string;
+    inhibited: Record<string, string | void>;
+    constructor(client: XernerxClient, action: XernerxMessage | XernerxInteraction, command: string);
+    inhibit(): Promise<Record<string, string | void> | undefined>;
+    private args;
+}

package/dist/mjs/validators/InhibitorValidations.js

@@ -0,0 +1,40 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.InhibitorValidation = void 0;
+const enums_js_1 = require('../types/enums.js');
+class InhibitorValidation {
+    client;
+    action;
+    command;
+    inhibited;
+    constructor(client, action, command) {
+        this.client = client;
+        this.action = action;
+        this.command = command;
+        this.inhibited = {};
+    }
+    async inhibit() {
+        for (const inhibitor of this.client.inhibitors) {
+            const inhibit = inhibitor[1];
+            if (inhibit) this.inhibited[inhibit.name] = await inhibit.check(this.action, this.args(this.action, inhibit.type));
+        }
+        for (const inhibit of Object.values(this.inhibited)) {
+            if (inhibit) return this.inhibited;
+        }
+    }
+    args(action, type) {
+        if (type === enums_js_1.InhibitorType.Channel) return action.channel;
+        if (type === enums_js_1.InhibitorType.User) return action.author || action.user;
+        if (type === enums_js_1.InhibitorType.Guild) return action.guild;
+        if (type === enums_js_1.InhibitorType.Member) return action.member;
+        // if (type === InhibitorType.Command)
+        // 	return this.client.util.getAllCommands().filter(this.command.name);
+        // if (type === InhibitorType.MessageCommand)
+        // 	return this.client.util.getAllMessageCommands().find(this.command.name);
+        // if (type === InhibitorType.SlashCommand)
+        // 	return this.client.util.getAllSlashCommands().find(this.command.name);
+        // if (type === InhibitorType.ContextCommand)
+        // 	return this.client.util.getAllContextCommands().find(this.command.name);
+    }
+}
+exports.InhibitorValidation = InhibitorValidation;

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "xernerx",
-    "version": "3.5.1",
-    "type": "module",
+    "version": "3.6.0",
     "description": "A bot framework for discord.js.",
-    "main": "dist/main.js",
+    "main": "dist/cjs/main.js",
+    "module": "dist/mjs/main.js",
     "keywords": [
         "discord.js",
         "discord",
@@ -17,13 +17,6 @@
     "license": "MIT",
     "homepage": "https://xernerx.github.io/xernerx/home.html",
     "packageManager": "npm@8.5.5",
-    "exports": {
-        "import": "./dist/main.js",
-        "require": "./dist/main.cjs",
-        "types": "./types",
-        "node": null,
-        "default": null
-    },
     "scripts": {
         "start": "npm i && npm fund && npm audit fix --force && npm link && tsc -w",
         "patch": "npm run write && git add . && npm run commit && npm version patch && npm publish && git push",
@@ -31,8 +24,11 @@
         "major": "npm run write && git add . && npm run commit && npm version major && npm publish && git push",
         "site": "git add docs && npm run commit && git push",
         "commit": "node ../.scripts/commit.js",
-        "write": "npm run build && node ../.scripts/rewritePackage.js ",
-        "build": "tsc && npx tsup src/main.ts && npx prettier --write src"
+        "write": "npm run build && npm run format && node ../.scripts/rewritePackage.js ",
+        "format": "npx prettier --write src dist",
+        "build": "npm run build:esm && npm run build:cjs && npm run format",
+        "build:esm": "tsc",
+        "build:cjs": "tsc --module CommonJS --outDir dist/cjs"
     },
     "repository": {
         "type": "git",
@@ -43,14 +39,14 @@
     },
     "dependencies": {
         "@sapphire/shapeshift": "^3.8.1",
+        "dbl-sdk": "^1.2.0",
         "discord.js": "^14.7.1",
-        "dumfunctions": "^2.1.1",
-        "xernerx-extension-builder": "^0.0.5",
+        "dumfunctions": "^2.1.2",
+        "xernerx-extension-builder": "^0.0.8",
         "zod": "^3.20.6"
     },
     "devDependencies": {
         "prettier": "^2.8.4",
-        "tsup": "^6.6.0",
         "typescript": "^4.9.5"
     }
 }

package/dist/build/ContextCommandBuilder.js

@@ -1,93 +0,0 @@
-import { ContextMenuCommandBuilder } from 'discord.js';
-import { z } from 'zod';
-import XernerxClient from '../client/XernerxClient.js';
-/**
- * @description The command builder for context commands.
- * @param {String} id - The unique ID of the command.
- * @param {ContextCommandOptions} options - The command options.
- */
-export default class ContextCommandBuilder {
-    id;
-    data;
-    name;
-    type;
-    description;
-    info;
-    category;
-    channelType;
-    cooldown;
-    ignore;
-    strict;
-    permissions;
-    defer;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        this.data = new ContextMenuCommandBuilder();
-        if (options.name)
-            this.data.setName(options.name);
-        if (options.type)
-            this.data.setType(options.type);
-        if (options.permissions?.users)
-            this.data.setDefaultMemberPermissions(options.permissions?.users);
-        if (options.permissions?.dm === false)
-            this.data.setDMPermission(options.permissions?.dm);
-        if (options.nameLocalizations)
-            this.data.setNameLocalizations(options.nameLocalizations);
-        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.type = options.type;
-        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;
-    }
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description make any preconditions here.
-     * TODO - update description
-     */
-    async conditions(interaction, args) { }
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description Make your custom command here.
-     * TODO - update description
-     */
-    async exec(interaction, args) { }
-}

package/dist/build/EventBuilder.js

@@ -1,34 +0,0 @@
-import { z } from 'zod';
-import XernerxClient from '../client/XernerxClient.js';
-/**
- * @description - The event builder for  events.
- * @param {String} id - The unique ID of the event.
- * @param {EventOptions} options - The event options.
- */
-export default class EventBuilder {
-    id;
-    name;
-    emitter;
-    type;
-    once;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        z.object({
-            name: z.string(),
-            emitter: z.string().optional(),
-            type: z.string().optional(),
-            once: z.boolean().optional(),
-        }).parse(options);
-        this.name = options.name;
-        this.emitter = options.emitter || 'client';
-        this.type = options.type || 'discord';
-        this.once = options.once || false;
-        this.client = XernerxClient;
-    }
-    /**
-     * @description run your custom event here.
-     * TODO - update description
-     */
-    async run() { }
-}

package/dist/build/InhibitorBuilder.js

@@ -1,27 +0,0 @@
-import { z } from 'zod';
-import XernerxClient from '../client/XernerxClient.js';
-/**
- * @description - The inhibitor builder for inhibitors.
- * @param {String} id - The unique ID of the inhibitor.
- * @param {InhibitorOptions} options - The inhibitor options.
- */
-export default class InhibitorBuilder {
-    id;
-    name;
-    type;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        z.object({
-            name: z.string(),
-            type: z.string(),
-        }).parse(options);
-        this.name = options.name;
-        this.type = options.type;
-        this.client = XernerxClient;
-    }
-    /**
-     * TODO - update description
-     */
-    async check(interaction, args) { }
-}

package/dist/build/MessageCommandBuilder.js

@@ -1,90 +0,0 @@
-import { z } from 'zod';
-import XernerxClient from '../client/XernerxClient.js';
-/**
- * @description - The command builder for message commands.
- * @param {String} id - The unique ID of the command.
- * @param {MessageCommandOptions} options - The command options.
- */
-export default class MessageCommandBuilder {
-    id;
-    name;
-    aliases;
-    separator;
-    description;
-    info;
-    category;
-    prefix;
-    regex;
-    channelType;
-    ignore;
-    strict;
-    permissions;
-    cooldown;
-    args;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        z.object({
-            name: z.string(),
-            aliases: z.array(z.string()).optional(),
-            separator: z.string().min(1).max(1).optional(),
-            description: z.string().optional(),
-            info: z.string().optional(),
-            category: z.string().optional(),
-            prefix: z.array(z.string()).or(z.string()).optional(),
-            regex: z.unknown(),
-            channelType: z.array(z.number()).or(z.number()).optional(),
-            cooldown: z.number().optional(),
-            ignore: z
-                .object({
-                owners: z.boolean().optional(),
-                users: z.array(z.string()).or(z.string()).optional(),
-                channels: z.array(z.string()).or(z.string()).optional(),
-                guilds: z.array(z.string()).or(z.string()).optional(),
-            })
-                .optional(),
-            strict: z
-                .object({
-                owners: z.boolean().optional(),
-                users: z.array(z.string()).or(z.string()).optional(),
-                channels: z.array(z.string()).or(z.string()).optional(),
-                guilds: z.array(z.string()).or(z.string()).optional(),
-            })
-                .optional(),
-            permissions: z
-                .object({
-                client: z.array(z.string()).optional(),
-                users: z.array(z.string()).optional(),
-                dm: z.boolean().optional(),
-            })
-                .optional(),
-        }).parse(options);
-        this.name = options.name;
-        this.aliases = options.aliases;
-        this.separator = options.separator || ' ';
-        this.description = options.description;
-        this.info = options.info;
-        this.category = options.category;
-        this.prefix = options.prefix ? (Array.isArray(options.prefix) ? options.prefix : [options.prefix]) : [];
-        this.regex = options.regex;
-        this.channelType = options.channelType;
-        this.ignore = options.ignore;
-        this.strict = options.strict;
-        this.permissions = options.permissions;
-        this.cooldown = options.cooldown || 0;
-        this.args = options.args || [];
-        this.client = XernerxClient;
-    }
-    /**
-     * @param {Message} message - The Discord message event data.
-     * @param {object} args - The arguments you created.
-     * @description make any preconditions here.
-     */
-    async conditions(message, args) { }
-    /**
-     * @param {Message} message - The Discord message event data.
-     * @param {object} args - The arguments you created.
-     * @description Make your custom command here.
-     */
-    async exec(message, args) { }
-}

package/dist/build/SlashCommandBuilder.js

@@ -1,125 +0,0 @@
-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);
-        }
-    }
-}