xernerx 3.3.6 → 3.3.7

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 Dummi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 Dummi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,21 +1,21 @@
-# xernerx
-
-Xernerx is a class based discord.js framework. \[BETA\]
-
-## Includes
-
-> - Slash command handler
-> - Message command handler
-> - Context command handler
-> - Event handler (with custom Events)
-> - Inhibitor handler
-> - Custom utilities
-> - Message command handles
-> - Extension support
-
-You can checkout the docs [here](https://thedummi.github.io/xernerx/home.html)
-
-## Notes
-
-- Only compatible with ESM
-- TypeScript and JavaScript support
+# xernerx
+
+Xernerx is a class based discord.js framework. \[BETA\]
+
+## Includes
+
+> - Slash command handler
+> - Message command handler
+> - Context command handler
+> - Event handler (with custom Events)
+> - Inhibitor handler
+> - Custom utilities
+> - Message command handles
+> - Extension support
+
+You can checkout the docs [here](https://xernerx.github.io/xernerx/home.html)
+
+## Notes
+
+- Only compatible with ESM
+- TypeScript and JavaScript support

package/dist/build/ContextCommandBuilder.d.ts

@@ -1,6 +1,6 @@
-import { ChannelType, ContextMenuCommandBuilder, Interaction } from "discord.js";
-import { XernerxClient } from "../main.js";
-import { ContextCommandOptions } from "../types/options.js";
+import { ChannelType, ContextMenuCommandBuilder, Interaction } from 'discord.js';
+import { XernerxClient } from '../main.js';
+import { ContextCommandOptions } from '../types/options.js';
 /**
  * @description The command builder for context commands.
  * @param {String} id - The unique ID of the command.
@@ -13,7 +13,7 @@ export default class ContextCommandBuilder {
     info?: string;
     category?: string;
     owner?: boolean;
-    channelType?: ChannelType;
+    channelType?: ChannelType | ChannelType[];
     cooldown?: number;
     ignoreOwner?: boolean;
     channels?: string[];

package/dist/build/ContextCommandBuilder.js

@@ -1,6 +1,6 @@
-import { ContextMenuCommandBuilder, } from "discord.js";
-import { s } from "@sapphire/shapeshift";
-import { XernerxClient } from "../main.js";
+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.
@@ -42,7 +42,7 @@ export default class ContextCommandBuilder {
             info: s.string.optional,
             category: s.string.optional,
             owner: s.boolean.optional,
-            // channelType?: ChannelType,
+            channelType: s.union(s.number, s.array(s.number)).optional,
             cooldown: s.number.optional,
             ignoreOwner: s.boolean.optional,
             channels: s.array(s.string).optional,

package/dist/build/EventBuilder.d.ts

@@ -1,5 +1,5 @@
-import { XernerxClient } from "../main.js";
-import { EventOptions } from "../types/options.js";
+import { XernerxClient } from '../main.js';
+import { EventOptions } from '../types/options.js';
 /**
  * @description - The event builder for  events.
  * @param {String} id - The unique ID of the event.

package/dist/build/EventBuilder.js

@@ -1,5 +1,5 @@
-import { s } from "@sapphire/shapeshift";
-import { XernerxClient } from "../main.js";
+import { s } from '@sapphire/shapeshift';
+import { XernerxClient } from '../main.js';
 /**
  * @description - The event builder for  events.
  * @param {String} id - The unique ID of the event.
@@ -21,8 +21,8 @@ export default class EventBuilder {
             once: s.boolean.optional,
         }).parse(options);
         this.name = options.name;
-        this.emitter = options.emitter || "client";
-        this.type = options.type || "discord";
+        this.emitter = options.emitter || 'client';
+        this.type = options.type || 'discord';
         this.once = options.once || false;
         this.client = XernerxClient;
         this.run = this.run;

package/dist/build/InhibitorBuilder.d.ts

@@ -1,6 +1,6 @@
-import { InhibitorType, XernerxClient } from "../main.js";
-import { InhibitorOptions, MessageArgOptions, SlashArgOptions } from "../types/options.js";
-import { XernerxInteraction, XernerxMessage } from "../types/types.js";
+import { InhibitorType, XernerxClient } from '../main.js';
+import { InhibitorOptions, MessageArgOptions, SlashArgOptions } from '../types/options.js';
+import { XernerxInteraction, XernerxMessage } from '../types/types.js';
 /**
  * @description - The inhibitor builder for inhibitors.
  * @param {String} id - The unique ID of the inhibitor.

package/dist/build/InhibitorBuilder.js

@@ -1,5 +1,5 @@
-import { s } from "@sapphire/shapeshift";
-import { XernerxClient } from "../main.js";
+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.

package/dist/build/MessageCommandBuilder.js

@@ -35,7 +35,7 @@ export default class MessageCommandBuilder {
             category: s.string.optional,
             prefix: s.union(s.array(s.string).unique, s.string).optional,
             owner: s.boolean.optional,
-            // channelType: s.union(s.enum(ChannelType),s.array(s.enum(ChannelType)).unique).optional,
+            channelType: s.union(s.number, s.array(s.number)).optional,
             separator: s.string.optional,
             cooldown: s.number.optional,
             ignoreOwner: s.boolean.optional,

package/dist/build/SlashCommandBuilder.d.ts

@@ -13,7 +13,7 @@ export default class SlashCommandBuilder {
     info?: string;
     category?: string;
     owner?: boolean;
-    channelType?: ChannelType;
+    channelType?: ChannelType | ChannelType[];
     separator?: string;
     cooldown?: number;
     ignoreOwner?: boolean;

package/dist/build/SlashCommandBuilder.js

@@ -42,7 +42,7 @@ export default class SlashCommandBuilder {
             info: s.string.optional,
             category: s.string.optional,
             owner: s.boolean.optional,
-            // channelType: s.ChannelType.optional,
+            channelType: s.union(s.number, s.array(s.number)).optional,
             separator: s.string.optional,
             cooldown: s.number.optional,
             ignoreOwner: s.boolean.optional,

package/dist/main.js

@@ -9,7 +9,7 @@ import SlashCommandBuilder from './build/SlashCommandBuilder.js';
 import { CommandType, EventEmitterType, ContextCommandType, InhibitorType } from './types/enums.js';
 import XernerxError from './tools/XernerxError.js';
 import ExtensionBuilder from 'xernerx-extension-builder';
-import pkg from '../scripts/package.js';
+import pkg from './tools/package.js';
 const version = pkg.version;
 export default {
     // Imported methods

package/dist/models/CommandValidations.d.ts

@@ -1,4 +1,4 @@
-import { Interaction } from "discord.js";
-import { ContextCommandBuilder, MessageCommandBuilder, SlashCommandBuilder, XernerxClient } from "../main.js";
-import { XernerxMessage } from "../types/types.js";
+import { Interaction } from 'discord.js';
+import { ContextCommandBuilder, MessageCommandBuilder, SlashCommandBuilder, XernerxClient } from '../main.js';
+import { XernerxMessage } from '../types/types.js';
 export default function commandValidation(action: XernerxMessage | Interaction, command: SlashCommandBuilder | MessageCommandBuilder | ContextCommandBuilder | any, client: XernerxClient, res?: boolean): boolean;

package/dist/models/CommandValidations.js

@@ -1,5 +1,5 @@
-import { Message } from "discord.js";
-import { CommandType } from "../types/enums.js";
+import { Message } from 'discord.js';
+import { CommandType } from '../types/enums.js';
 function getUser(from) {
     if (from instanceof Message)
         return from.author;
@@ -14,26 +14,30 @@ 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, command, "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, command, "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, command, "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, command, "Not a whitelisted guild", command.guilds);
+        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.userPermissions || client.settings.userPermissions)) {
-        const permissions = command.userPermissions || client?.settings?.userPermissions?.push(...handlerPermissions(client, command.commandType, "user")), missing = [];
+        const permissions = command.userPermissions || client?.settings?.userPermissions?.push(...handlerPermissions(client, command.commandType, 'user')), missing = [];
         if (Array.isArray(permissions))
             permissions.map((permission) => {
                 if (!(action.member?.permissions).has(permission)) {
@@ -42,11 +46,11 @@ export default function commandValidation(action, command, client, res = false)
             });
         if (missing.length > 0) {
             res = true;
-            emit(client, action, command, "Missing User Permissions", missing);
+            emit(client, action, command, 'Missing User Permissions', missing);
         }
     }
     else if (action?.guild && (command.clientPermissions || client.settings.clientPermissions)) {
-        const permissions = command.clientPermissions || client?.settings?.clientPermissions?.push(...handlerPermissions(client, command.commandType, "client")), missing = [];
+        const permissions = command.clientPermissions || client?.settings?.clientPermissions?.push(...handlerPermissions(client, command.commandType, 'client')), missing = [];
         if (Array.isArray(permissions))
             permissions.map((permission) => {
                 if (!(action.member?.permissions).has(permission)) {
@@ -55,17 +59,17 @@ export default function commandValidation(action, command, client, res = false)
             });
         if (missing.length > 0) {
             res = true;
-            emit(client, action, command, "Missing Client Permissions", missing);
+            emit(client, action, command, 'Missing Client Permissions', missing);
         }
     }
     return res;
 }
 function emit(client, action, command, reason, extra) {
-    return client.emit("commandBlock", 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;
+    const { cooldowns, messageCommands, slashCommands, contextCommands, commands } = client.cache;
     if (command.commandType === CommandType.MessageCommand && client.handlerOptions.message.cooldown) {
         if (messageCommands.has(user.id)) {
             const usr = messageCommands.get(user.id);
@@ -80,8 +84,7 @@ function inCooldown(user, client, command, action) {
             }, client.handlerOptions.message.cooldown);
         }
     }
-    if (command.commandType === 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();
@@ -95,8 +98,7 @@ function inCooldown(user, client, command, action) {
             }, client.handlerOptions.slash.cooldown);
         }
     }
-    if (command.commandType === 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();
@@ -125,11 +127,7 @@ function inCooldown(user, client, command, action) {
         }
     }
     if (command.cooldown) {
-        const name = user.id +
-            "-" +
-            (command.data?.name || command?.name) +
-            "-" +
-            command.commandType;
+        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();
@@ -144,7 +142,7 @@ function inCooldown(user, client, command, action) {
         }
     }
     if (Object.keys(downs).length > 0)
-        client.emit("commandCooldown", action, command, downs);
+        client.emit('commandCooldown', action, command, downs);
     return res;
 }
 function toCooldown(action, command, cooldown, name) {
@@ -164,21 +162,21 @@ function toCooldown(action, command, cooldown, name) {
 function handlerPermissions(client, commandType, type) {
     let permissions = [];
     if (commandType === CommandType.MessageCommand) {
-        if (type === "user")
+        if (type === 'user')
             permissions = client.handlerOptions.message?.userPermissions || [];
-        else if (type === "client")
+        else if (type === 'client')
             permissions = client.handlerOptions.message?.clientPermissions || [];
     }
     else if (commandType === CommandType.SlashCommand) {
-        if (type === "user")
+        if (type === 'user')
             permissions = client.handlerOptions.slash?.userPermissions || [];
-        else if (type === "client")
+        else if (type === 'client')
             permissions = client.handlerOptions.slash?.clientPermissions || [];
     }
     else if (commandType === CommandType.ContextCommand) {
-        if (type === "user")
+        if (type === 'user')
             permissions = client.handlerOptions.context?.userPermissions || [];
-        else if (type === "client")
+        else if (type === 'client')
             permissions = client.handlerOptions.context?.clientPermissions || [];
     }
     return permissions;

package/dist/models/Events.js

@@ -129,14 +129,16 @@ export class MessageCommandEvents {
     messageDelete() {
         this.client.on('messageDelete', async (message) => {
             if (this.client.cache.messages.has(message.id) && this.client.handlerOptions.message?.handleDeletes) {
-                if (this.client.handlerOptions.message?.handleTyping)
-                    message.channel.sendTyping();
                 try {
+                    if (this.client.handlerOptions.message?.handleTyping)
+                        message.channel.sendTyping();
                     const msg = this.client.cache.messages.get(message.id);
                     const response = await message.channel.messages.fetch(msg?.response);
                     await response.delete();
                 }
-                catch { }
+                catch (error) {
+                    this.client.emit('commandError', message, error, null);
+                }
             }
         });
     }
@@ -231,13 +233,13 @@ export class CommandsDeploy {
                     this.put('global', guild.slash, [...contextCommands, ...slashCommands]);
                     this.put('guild', guild.slash, []);
                 }
-                if (global.slash && !global.context) {
+                if (global.slash && global.context === false) {
                     this.put('global', guild.slash, slashCommands);
                 }
-                if (!global.slash && global.context) {
+                if (global.slash === false && global.context) {
                     this.put('global', guild.context, contextCommands);
                 }
-                if (!global.slash && !global.context) {
+                if (global.slash === false && global.context === false) {
                     this.put('guild', guild.slash, [...contextCommands, ...slashCommands]);
                 }
                 console.log(Style.log(`Xernerx | Deployed ${slashCommands.length} slash commands ${global.slash ? 'globally' : 'locally'} and ${contextCommands.length} context commands ${global.context ? 'globally' : 'locally'}.`, { color: Style.TextColor.Purple }));

package/dist/tools/package.d.ts

@@ -0,0 +1,38 @@
+declare const _default: {
+    name: string;
+    version: string;
+    type: string;
+    description: string;
+    main: string;
+    keywords: string[];
+    author: string;
+    license: string;
+    homepage: string;
+    packageManager: string;
+    scripts: {
+        start: string;
+        patch: string;
+        minor: string;
+        major: string;
+        site: string;
+        commit: string;
+        package: string;
+    };
+    repository: {
+        type: string;
+        url: string;
+    };
+    bugs: {
+        url: string;
+    };
+    dependencies: {
+        "@sapphire/shapeshift": string;
+        "discord.js": string;
+        dumfunctions: string;
+        "xernerx-extension-builder": string;
+    };
+    devDependencies: {
+        typescript: string;
+    };
+};
+export default _default;

package/dist/tools/package.js

@@ -0,0 +1,41 @@
+export default {
+    "name": "xernerx",
+    "version": "3.3.6",
+    "type": "module",
+    "description": "A bot framework for discord.js.",
+    "main": "dist/main.js",
+    "keywords": [
+        "discord.js",
+        "discord",
+        "framework"
+    ],
+    "author": "Dummi",
+    "license": "MIT",
+    "homepage": "https://xernerx.github.io/xernerx/home.html",
+    "packageManager": "npm@8.5.5",
+    "scripts": {
+        "start": "npm i && npm fund && npm audit fix --force &&  npm link && npm run package && tsc -w",
+        "patch": "git add . && npm run commit && npm version patch && npm publish && git push",
+        "minor": "git add . && npm run commit && npm version minor && npm publish && git push",
+        "major": "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",
+        "package": "node ../scripts/rewritePackage.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/xernerx/xernerx.git"
+    },
+    "bugs": {
+        "url": "https://github.com/xernerx/xernerx/issues"
+    },
+    "dependencies": {
+        "@sapphire/shapeshift": "^3.8.1",
+        "discord.js": "^14.7.0",
+        "dumfunctions": "^2.0.0",
+        "xernerx-extension-builder": "^0.0.2"
+    },
+    "devDependencies": {
+        "typescript": "^4.9.4"
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "3.3.6",
+	"version": "3.3.7",
 	"type": "module",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
@@ -11,22 +11,23 @@
 	],
 	"author": "Dummi",
 	"license": "MIT",
-	"homepage": "https://thedummi.github.io/xernerx/home.html",
+	"homepage": "https://xernerx.github.io/xernerx/home.html",
 	"packageManager": "npm@8.5.5",
 	"scripts": {
-		"checks": "npm i && npm fund && npm audit fix --force &&  npm link && tsc -w",
+		"start": "npm i && npm fund && npm audit fix --force &&  npm link && npm run package && tsc -w",
 		"patch": "git add . && npm run commit && npm version patch && npm publish && git push",
 		"minor": "git add . && npm run commit && npm version minor && npm publish && git push",
 		"major": "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"
+		"commit": "node ../.scripts/commit.js",
+		"package": "node ../.scripts/rewritePackage.js"
 	},
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/TheDummi/xernerx.git"
+		"url": "git+https://github.com/xernerx/xernerx.git"
 	},
 	"bugs": {
-		"url": "https://github.com/TheDummi/xernerx/issues"
+		"url": "https://github.com/xernerx/xernerx/issues"
 	},
 	"dependencies": {
 		"@sapphire/shapeshift": "^3.8.1",

package/dist/build/ContextCommand.d.ts

@@ -1,40 +0,0 @@
-import { ChannelType, ContextMenuCommandBuilder, Interaction } from "discord.js";
-import { ContextCommandOptions } from "../interfaces/CommandInterfaces.js";
-import { XernerxClient } from "../main.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;
-    description?: string;
-    info?: string;
-    category?: string;
-    owner?: boolean;
-    channelType?: ChannelType;
-    cooldown?: number;
-    ignoreOwner?: boolean;
-    channels?: string[];
-    guilds?: string[];
-    userPermissions?: bigint[];
-    clientPermissions?: bigint[];
-    defer?: {
-        reply?: boolean;
-        ephemeral?: boolean;
-        fetchReply?: boolean;
-    };
-    client: XernerxClient | object;
-    constructor(id: string, options: ContextCommandOptions);
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description make any preconditions here.
-     */
-    conditions(interaction: Interaction): Promise<void>;
-    /**
-     * @param {Interaction} interaction - The Discord interaction event data.
-     * @description Make your custom command here.
-     */
-    exec(interaction: Interaction): Promise<void>;
-}