xernerx 3.5.2 → 4.0.0

package/dist/{mjs/validators → validators}/CommandValidations.js

@@ -1,14 +1,12 @@
-'use strict';
-Object.defineProperty(exports, '__esModule', { value: true });
-const discord_js_1 = require('discord.js');
-const enums_js_1 = require('../types/enums.js');
+import { Message } from 'discord.js';
+import { CommandType } from '../types/enums.js';
 function getUser(from) {
-    if (from instanceof discord_js_1.Message) return from.author;
+    if (from instanceof Message) return from.author;
     else return from.user;
 }
-function commandValidation(action, command, client, res = false) {
+export default function commandValidation(action, command, client, res = false) {
     let user = getUser(action);
-    if ((command.ignoreOwner || client.settings.ignore?.owner) && client.util.isOwner(user.id)) return res;
+    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;
@@ -57,7 +55,6 @@ function commandValidation(action, command, client, res = false) {
     }
     return res;
 }
-exports.default = commandValidation;
 function emit(client, action, command, reason, extra) {
     return client.emit('commandBlock', action, command, reason, extra);
 }
@@ -65,7 +62,7 @@ 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 (command.commandType === CommandType.MessageCommand && client.handlerOptions.message.cooldown) {
         if (messageCommands.has(user.id)) {
             const usr = messageCommands.get(user.id);
             usr.timeRemaining = usr.endsAt - Date.now();
@@ -79,7 +76,7 @@ function inCooldown(user, client, command, action) {
             }, client.handlerOptions.message.cooldown);
         }
     }
-    if (command.commandType === enums_js_1.CommandType.SlashCommand && client.handlerOptions.slash.cooldown) {
+    if (command.commandType === CommandType.SlashCommand && client.handlerOptions.slash.cooldown) {
         if (slashCommands.has(user.id)) {
             const usr = slashCommands.get(user.id);
             usr.timeRemaining = usr.endsAt - Date.now();
@@ -93,7 +90,7 @@ function inCooldown(user, client, command, action) {
             }, client.handlerOptions.slash.cooldown);
         }
     }
-    if (command.commandType === enums_js_1.CommandType.ContextCommand && client.handlerOptions.context.cooldown) {
+    if (command.commandType === CommandType.ContextCommand && client.handlerOptions.context.cooldown) {
         if (contextCommands.has(user.id)) {
             const usr = contextCommands.get(user.id);
             usr.timeRemaining = usr.endsAt - Date.now();
@@ -155,13 +152,13 @@ function toCooldown(action, command, cooldown, name) {
 }
 function handlerPermissions(client, commandType, type) {
     let permissions = [];
-    if (commandType === enums_js_1.CommandType.MessageCommand) {
+    if (commandType === 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) {
+    } else if (commandType === 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) {
+    } else if (commandType === CommandType.ContextCommand) {
         if (type === 'user') permissions = client.handlerOptions.context?.userPermissions || [];
         else if (type === 'client') permissions = client.handlerOptions.context?.clientPermissions || [];
     }

package/dist/validators/InhibitorValidations.d.ts

@@ -0,0 +1,18 @@
+import { ContextCommandBuilder, MessageCommandBuilder, SlashCommandBuilder } from '../main.js';
+import { XernerxMessage } from '../types/extenders.js';
+import { InhibitorType, XernerxInteraction } from '../types/types.js';
+export declare function inhibitorValidation(event: XernerxMessage | XernerxInteraction, cmd?: ContextCommandBuilder | MessageCommandBuilder | SlashCommandBuilder): Promise<boolean>;
+export declare function inhibitorArguments(
+    event: XernerxMessage | XernerxInteraction,
+    cmd: ContextCommandBuilder | MessageCommandBuilder | SlashCommandBuilder | null,
+    type: InhibitorType
+):
+    | import('discord.js').Guild
+    | import('discord.js').GuildMember
+    | import('discord.js').TextBasedChannel
+    | import('discord.js').User
+    | SlashCommandBuilder
+    | ContextCommandBuilder
+    | MessageCommandBuilder
+    | import('../main.js').APIInteractionGuildMember
+    | null;

package/dist/validators/InhibitorValidations.js

@@ -0,0 +1,34 @@
+export async function inhibitorValidation(event, cmd) {
+    const client = event.client;
+    const inhibits = [];
+    for (const [name, inhibitor] of client.inhibitors) {
+        if (Boolean(await inhibitor.check(event, await inhibitorArguments(event, cmd || null, inhibitor.type)))) {
+            inhibits.push(name);
+        }
+    }
+    return !!inhibits.length;
+}
+export function inhibitorArguments(event, cmd, type) {
+    switch (type) {
+        case 'channel':
+            return event.channel || null;
+        case 'command':
+            return cmd;
+        case 'contextCommand':
+            return cmd;
+        case 'guild':
+            return event.guild || null;
+        case 'interaction':
+            return null;
+        case 'member':
+            return event.member || null;
+        case 'message':
+            return null;
+        case 'messageCommand':
+            return cmd;
+        case 'slashCommand':
+            return cmd;
+        case 'user':
+            return event.user;
+    }
+}

package/dist/validators/commandValidation.d.ts

@@ -0,0 +1,6 @@
+import ContextCommandBuilder from '../build/ContextCommandBuilder.js';
+import MessageCommandBuilder from '../build/MessageCommandBuilder.js';
+import SlashCommandBuilder from '../build/SlashCommandBuilder.js';
+import { XernerxMessage } from '../types/extenders.js';
+import { XernerxInteraction } from '../types/types.js';
+export default function commandValidation(event: XernerxInteraction | XernerxMessage, command: MessageCommandBuilder | SlashCommandBuilder | ContextCommandBuilder): Promise<boolean>;

package/dist/validators/commandValidation.js

@@ -0,0 +1,48 @@
+import { ChannelType, PermissionFlagsBits } from 'discord.js';
+export default async function commandValidation(event, command) {
+    const client = event.client;
+    if (command.ignore?.owner && client.settings.ownerId.includes(event.user.id)) return false;
+    if (!client.cache.cooldowns.has(`${event.user.id}-${command.name}`)) {
+        client.cache.cooldowns.set(`${event.user.id}-${command.name}`, {
+            id: event.user.id,
+            command: command.name,
+            createdTimestamp: Number(Date.now()) + (command.cooldown || 0),
+        });
+        setTimeout(() => {
+            client.cache.cooldowns.delete(`${event.user.id}-${command.name}`);
+        }, command.cooldown || 0);
+    } else {
+        const user = client.cache.cooldowns.get(`${event.user.id}-${command.name}`);
+        const time = (user?.createdTimestamp || 0) - Number(Date.now());
+        return emit(event, `Command on cooldown, ${time}`);
+    }
+    if ((command.ignore?.channels?.length || 0) > 0 && command.ignore?.channels?.includes(event.channel?.id)) return true;
+    if ((command.ignore?.guilds?.length || 0) > 0 && command.ignore?.guilds?.includes(event.guild?.id)) return true;
+    if ((command.ignore?.users?.length || 0) > 0 && command.ignore?.users?.includes(event.user.id)) return true;
+    if (command.strict?.owner && !client.settings.ownerId.includes(event.user.id)) return await emit(event, 'Command is a developer command');
+    if ((command.strict?.channels?.length || 0) > 0 && !command.strict?.channels?.includes(event.channel?.id)) return await emit(event, 'Command cannot be ran in this channel');
+    if ((command.strict?.guilds?.length || 0) > 0 && !command.strict?.guilds?.includes(event.guild?.id)) return await emit(event, 'Command cannot be ran in this guild');
+    if ((command.strict?.users?.length || 0) > 0 && !command.strict?.users?.includes(event.user.id)) return await emit(event, 'Command cannot be ran by you');
+    if (command.permissions?.dm == false && event.channel?.type === ChannelType.DM) return await emit(event, "Can't use in a DM Channel");
+    if (command.permissions?.user) {
+        if (!(event.member?.permissions).has(toBigInt(command.permissions.user))) return await emit(event, 'Missing User Permissions');
+    }
+    return false;
+}
+async function emit(event, reason) {
+    return await event.client.emit('commandBlock', event, reason);
+}
+function toBigInt(permissions) {
+    let bigIntPermissions = 0n;
+    permissions.map((permission) => {
+        permission =
+            PermissionFlagsBits[
+                permission
+                    .split(/ +/)
+                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+                    .join('')
+            ];
+        if (typeof permission === 'bigint') bigIntPermissions += permission;
+    });
+    return bigIntPermissions;
+}

package/dist/validators/commands.d.ts

@@ -0,0 +1,4 @@
+import { ContextCommandBuilder, MessageCommandBuilder, SlashCommandBuilder } from '../main.js';
+import { XernerxMessage } from '../types/extenders.js';
+import { XernerxInteraction } from '../types/types.js';
+export default function commandValidation(event: XernerxInteraction | XernerxMessage, command: MessageCommandBuilder | SlashCommandBuilder | ContextCommandBuilder): Promise<boolean>;

package/dist/validators/commands.js

@@ -0,0 +1,25 @@
+import { ChannelType, PermissionFlagsBits } from '../main.js';
+export default async function commandValidation(event, command) {
+    if (command.permissions?.dm == false && event.channel?.type === ChannelType.DM) return await emit(event, "Can't use in a DM Channel");
+    if (command.permissions?.user) {
+        if (!(event.member?.permissions).has(toBigInt(command.permissions.user))) return await emit(event, 'Missing User Permissions');
+    }
+    return true;
+}
+async function emit(event, reason) {
+    return await event.client.emit('commandBlock', event, reason);
+}
+function toBigInt(permissions) {
+    let bigIntPermissions = 0n;
+    permissions.map((permission) => {
+        permission =
+            PermissionFlagsBits[
+                permission
+                    .split(/ +/)
+                    .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+                    .join('')
+            ];
+        if (typeof permission === 'bigint') bigIntPermissions += permission;
+    });
+    return bigIntPermissions;
+}

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "xernerx",
-    "version": "3.5.2",
+    "version": "4.0.0",
     "description": "A bot framework for discord.js.",
-    "main": "dist/cjs/main.js",
-    "module": "dist/mjs/main.js",
+    "main": "dist/main.js",
+    "type": "module",
     "keywords": [
         "discord.js",
         "discord",
@@ -15,7 +15,7 @@
     ],
     "author": "Dummi",
     "license": "MIT",
-    "homepage": "https://xernerx.github.io/xernerx/home.html",
+    "homepage": "https://xernerx.github.io/xernerx",
     "packageManager": "npm@8.5.5",
     "scripts": {
         "start": "npm i && npm fund && npm audit fix --force && npm link && tsc -w",
@@ -26,9 +26,7 @@
         "commit": "node ../.scripts/commit.js",
         "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",
-        "build:esm": "tsc",
-        "build:cjs": "tsc --module CommonJS --outDir dist/cjs"
+        "build": "tsc && npm run format"
     },
     "repository": {
         "type": "git",
@@ -38,14 +36,13 @@
         "url": "https://github.com/xernerx/xernerx/issues"
     },
     "dependencies": {
-        "@sapphire/shapeshift": "^3.8.1",
-        "discord.js": "^14.7.1",
+        "discord.js": "^14.9.0",
         "dumfunctions": "^2.1.2",
-        "xernerx-extension-builder": "^0.0.8",
-        "zod": "^3.20.6"
+        "xernerx-extension-builder": "^0.0.9",
+        "zod": "^3.21.4"
     },
     "devDependencies": {
-        "prettier": "^2.8.4",
-        "typescript": "^4.9.5"
+        "prettier": "^2.8.7",
+        "typescript": "^5.0.3"
     }
 }

package/dist/cjs/build/ContextCommandBuilder.d.ts

@@ -1,68 +0,0 @@
-import { ContextMenuCommandBuilder, Interaction } from 'discord.js';
-import { ContextCommandOptions } from '../types/options.js';
-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: string;
-    data: ContextMenuCommandBuilder;
-    name: string;
-    type: import('@discordjs/builders').ContextMenuCommandType;
-    description: string | undefined;
-    info: string | undefined;
-    category: string | undefined;
-    channelType: number | number[] | undefined;
-    cooldown: number | undefined;
-    ignore:
-        | {
-              owner?: boolean | undefined;
-              users?: string[] | undefined;
-              channels?: string[] | undefined;
-              guilds?: string[] | undefined;
-          }
-        | undefined;
-    strict:
-        | {
-              owner?: boolean | undefined;
-              users?: string[] | undefined;
-              channels?: string[] | undefined;
-              guilds?: string[] | undefined;
-          }
-        | undefined;
-    permissions:
-        | {
-              client?: string[] | undefined;
-              users?: string[] | undefined;
-              dm?: boolean | undefined;
-          }
-        | undefined;
-    defer:
-        | {
-              /**
-               * @param {Interaction} interaction - The Discord interaction event data.
-               * @description Make your custom command here.
-               * TODO - update description
-               */
-              reply?: boolean | undefined;
-              ephemeral?: boolean | undefined;
-              fetch?: boolean | undefined;
-          }
-        | undefined;
-    client: typeof XernerxClient;
-    constructor(id: string, options: ContextCommandOptions);
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description make any preconditions here.
-     * TODO - update description
-     */
-    conditions(interaction: Interaction, args: any): Promise<void>;
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description Make your custom command here.
-     * TODO - update description
-     */
-    exec(interaction: Interaction, args: any): Promise<void>;
-}

package/dist/cjs/build/ContextCommandBuilder.js

@@ -1,97 +0,0 @@
-'use strict';
-var __importDefault =
-    (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: mod };
-    };
-Object.defineProperty(exports, '__esModule', { value: true });
-const discord_js_1 = require('discord.js');
-const zod_1 = require('zod');
-const XernerxClient_js_1 = __importDefault(require('../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.
- */
-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 discord_js_1.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);
-        zod_1.z
-            .object({
-                description: zod_1.z.string(),
-                info: zod_1.z.string(),
-                category: zod_1.z.string(),
-                channelType: zod_1.z.array(zod_1.z.number()).or(zod_1.z.number()),
-                cooldown: zod_1.z.number(),
-                ignore: zod_1.z.object({
-                    owner: zod_1.z.boolean(),
-                    users: zod_1.z.array(zod_1.z.string()),
-                    channels: zod_1.z.array(zod_1.z.string()),
-                    guilds: zod_1.z.array(zod_1.z.string()),
-                }),
-                strict: zod_1.z.object({
-                    owner: zod_1.z.boolean(),
-                    users: zod_1.z.array(zod_1.z.string()),
-                    channels: zod_1.z.array(zod_1.z.string()),
-                    guilds: zod_1.z.array(zod_1.z.string()),
-                }),
-                permissions: zod_1.z.object({
-                    client: zod_1.z.array(zod_1.z.string()),
-                    users: zod_1.z.array(zod_1.z.string()),
-                    dm: zod_1.z.boolean(),
-                }),
-                defer: zod_1.z.object({
-                    reply: zod_1.z.boolean(),
-                    ephemeral: zod_1.z.boolean(),
-                    fetch: zod_1.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_js_1.default;
-    }
-    /**
-     * @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) {}
-}
-exports.default = ContextCommandBuilder;

package/dist/cjs/build/EventBuilder.js

@@ -1,44 +0,0 @@
-'use strict';
-var __importDefault =
-    (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: mod };
-    };
-Object.defineProperty(exports, '__esModule', { value: true });
-const zod_1 = require('zod');
-const XernerxClient_js_1 = __importDefault(require('../client/XernerxClient.js'));
-/**
- * @description - The event builder for  events.
- * @param {String} id - The unique ID of the event.
- * @param {EventOptions} options - The event options.
- */
-class EventBuilder {
-    id;
-    name;
-    emitter;
-    type;
-    once;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        zod_1.z
-            .object({
-                name: zod_1.z.string(),
-                emitter: zod_1.z.string().optional(),
-                type: zod_1.z.string().optional(),
-                once: zod_1.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_js_1.default;
-    }
-    /**
-     * @description run your custom event here.
-     * TODO - update description
-     */
-    async run() {}
-}
-exports.default = EventBuilder;

package/dist/cjs/build/InhibitorBuilder.js

@@ -1,37 +0,0 @@
-'use strict';
-var __importDefault =
-    (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: mod };
-    };
-Object.defineProperty(exports, '__esModule', { value: true });
-const zod_1 = require('zod');
-const XernerxClient_js_1 = __importDefault(require('../client/XernerxClient.js'));
-/**
- * @description - The inhibitor builder for inhibitors.
- * @param {String} id - The unique ID of the inhibitor.
- * @param {InhibitorOptions} options - The inhibitor options.
- */
-class InhibitorBuilder {
-    id;
-    name;
-    type;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        zod_1.z
-            .object({
-                name: zod_1.z.string(),
-                type: zod_1.z.string(),
-            })
-            .parse(options);
-        this.name = options.name;
-        this.type = options.type;
-        this.client = XernerxClient_js_1.default;
-    }
-    /**
-     * TODO - update description
-     */
-    async check(interaction, args) {}
-}
-exports.default = InhibitorBuilder;

package/dist/cjs/build/MessageCommandBuilder.js

@@ -1,100 +0,0 @@
-'use strict';
-var __importDefault =
-    (this && this.__importDefault) ||
-    function (mod) {
-        return mod && mod.__esModule ? mod : { default: mod };
-    };
-Object.defineProperty(exports, '__esModule', { value: true });
-const zod_1 = require('zod');
-const XernerxClient_js_1 = __importDefault(require('../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.
- */
-class MessageCommandBuilder {
-    id;
-    name;
-    aliases;
-    separator;
-    description;
-    info;
-    category;
-    prefix;
-    regex;
-    channelType;
-    ignore;
-    strict;
-    permissions;
-    cooldown;
-    args;
-    client;
-    constructor(id, options) {
-        this.id = id;
-        zod_1.z
-            .object({
-                name: zod_1.z.string(),
-                aliases: zod_1.z.array(zod_1.z.string()).optional(),
-                separator: zod_1.z.string().min(1).max(1).optional(),
-                description: zod_1.z.string().optional(),
-                info: zod_1.z.string().optional(),
-                category: zod_1.z.string().optional(),
-                prefix: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                regex: zod_1.z.unknown(),
-                channelType: zod_1.z.array(zod_1.z.number()).or(zod_1.z.number()).optional(),
-                cooldown: zod_1.z.number().optional(),
-                ignore: zod_1.z
-                    .object({
-                        owners: zod_1.z.boolean().optional(),
-                        users: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                        channels: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                        guilds: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                    })
-                    .optional(),
-                strict: zod_1.z
-                    .object({
-                        owners: zod_1.z.boolean().optional(),
-                        users: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                        channels: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                        guilds: zod_1.z.array(zod_1.z.string()).or(zod_1.z.string()).optional(),
-                    })
-                    .optional(),
-                permissions: zod_1.z
-                    .object({
-                        client: zod_1.z.array(zod_1.z.string()).optional(),
-                        users: zod_1.z.array(zod_1.z.string()).optional(),
-                        dm: zod_1.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_js_1.default;
-    }
-    /**
-     * @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) {}
-}
-exports.default = MessageCommandBuilder;