xernerx 3.5.1 → 3.6.0

package/dist/{tools → cjs/tools}/package.js

@@ -1,21 +1,16 @@
-export default {
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.default = {
     name: 'xernerx',
-    version: '3.5.0',
-    type: 'module',
+    version: '3.5.2',
     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', 'framework', 'mjs', 'esm', 'cjs', 'ts'],
     author: 'Dummi',
     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',
@@ -23,8 +18,11 @@ export default {
         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 types',
+        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',
     },
     repository: {
         type: 'git',
@@ -35,14 +33,13 @@ export default {
     },
     dependencies: {
         '@sapphire/shapeshift': '^3.8.1',
-        'discord.js': '^14.7.0',
-        dumfunctions: '^2.0.0',
-        'xernerx-extension-builder': '^0.0.2',
+        'discord.js': '^14.7.1',
+        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/cjs/types/enums.d.ts

@@ -0,0 +1,44 @@
+import {
+    SlashCommandStringOption,
+    SlashCommandNumberOption,
+    SlashCommandIntegerOption,
+    SlashCommandBooleanOption,
+    SlashCommandUserOption,
+    SlashCommandChannelOption,
+    SlashCommandRoleOption,
+    SlashCommandMentionableOption,
+} from 'discord.js';
+export declare enum InhibitorType {
+    Member = 'Member',
+    User = 'User',
+    Guild = 'Guild',
+    SlashCommand = 'SlashCommand',
+    MessageCommand = 'MessageCommand',
+    ContextCommand = 'ContextCommand',
+    Command = 'Command',
+    Message = 'Message',
+    Interaction = 'Interaction',
+    Channel = 'Channel',
+}
+export declare enum CommandType {
+    Message = 'MessageCommand',
+    Slash = 'SlashCommand',
+    Context = 'ContextCommand',
+    Event = 'Event',
+    Inhibitor = 'Inhibitor',
+    MessageCommand = 'MessageCommand',
+    SlashCommand = 'SlashCommand',
+    ContextCommand = 'ContextCommand',
+}
+export declare enum ContextCommandType {
+    Message = 3,
+    User = 2,
+}
+export declare enum EventEmitterType {
+    Client = 'client',
+    Rest = 'rest',
+    Process = 'process',
+}
+export type SlashCommandOptionChoices = SlashCommandStringOption | SlashCommandNumberOption | SlashCommandIntegerOption;
+export type SlashCommandOption = SlashCommandOptionChoices | SlashCommandBooleanOption | SlashCommandUserOption | SlashCommandChannelOption | SlashCommandRoleOption | SlashCommandMentionableOption;
+export type SlashArgumentTypes = 'String' | 'Number' | 'Boolean' | 'User' | 'Channel' | 'Role' | 'Mentionable' | 'Integer';

package/dist/cjs/types/enums.js

@@ -0,0 +1,38 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.EventEmitterType = exports.ContextCommandType = exports.CommandType = exports.InhibitorType = void 0;
+var InhibitorType;
+(function (InhibitorType) {
+    InhibitorType['Member'] = 'Member';
+    InhibitorType['User'] = 'User';
+    InhibitorType['Guild'] = 'Guild';
+    InhibitorType['SlashCommand'] = 'SlashCommand';
+    InhibitorType['MessageCommand'] = 'MessageCommand';
+    InhibitorType['ContextCommand'] = 'ContextCommand';
+    InhibitorType['Command'] = 'Command';
+    InhibitorType['Message'] = 'Message';
+    InhibitorType['Interaction'] = 'Interaction';
+    InhibitorType['Channel'] = 'Channel';
+})((InhibitorType = exports.InhibitorType || (exports.InhibitorType = {})));
+var CommandType;
+(function (CommandType) {
+    CommandType['Message'] = 'MessageCommand';
+    CommandType['Slash'] = 'SlashCommand';
+    CommandType['Context'] = 'ContextCommand';
+    CommandType['Event'] = 'Event';
+    CommandType['Inhibitor'] = 'Inhibitor';
+    CommandType['MessageCommand'] = 'MessageCommand';
+    CommandType['SlashCommand'] = 'SlashCommand';
+    CommandType['ContextCommand'] = 'ContextCommand';
+})((CommandType = exports.CommandType || (exports.CommandType = {})));
+var ContextCommandType;
+(function (ContextCommandType) {
+    ContextCommandType[(ContextCommandType['Message'] = 3)] = 'Message';
+    ContextCommandType[(ContextCommandType['User'] = 2)] = 'User';
+})((ContextCommandType = exports.ContextCommandType || (exports.ContextCommandType = {})));
+var EventEmitterType;
+(function (EventEmitterType) {
+    EventEmitterType['Client'] = 'client';
+    EventEmitterType['Rest'] = 'rest';
+    EventEmitterType['Process'] = 'process';
+})((EventEmitterType = exports.EventEmitterType || (exports.EventEmitterType = {})));

package/dist/{types → cjs/types}/interfaces.d.ts

@@ -5,6 +5,7 @@ import InhibitorHandler from '../handlers/InhibitorHandler.js';
 import MessageCommandBuilder from '../build/MessageCommandBuilder.js';
 import ContextCommandBuilder from '../build/ContextCommandBuilder.js';
 import SlashCommandBuilder from '../build/SlashCommandBuilder.js';
+import WebhookHandler from '../handlers/WebhookHandler.js';
 export interface ClientCommands {
     message: Collection<string, MessageCommandBuilder>;
     slash: Collection<string, SlashCommandBuilder>;
@@ -22,4 +23,5 @@ export interface ClientModules {
     commandHandler: CommandHandler;
     eventHandler: EventHandler;
     inhibitorHandler: InhibitorHandler;
+    webhookHandler: WebhookHandler;
 }

package/dist/cjs/types/interfaces.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/dist/{types → cjs/types}/options.d.ts

@@ -46,6 +46,7 @@ export interface HandlerOptions {
     context?: ContextCommandHandlerOptions;
     events?: EventHandlerOptions;
     inhibitors?: InhibitorHandlerOptions;
+    webhook?: WebhookOptions;
 }
 export interface ExtensionOptions {
     extensions: Array<XernerxExtensionBuilder>;
@@ -239,3 +240,15 @@ export interface InhibitorOptions {
     name: string;
     type: InhibitorType;
 }
+export interface WebhookOptions {
+    topgg: {
+        token: string;
+    };
+    dbl: {
+        token: string;
+    };
+    config: {
+        emits: boolean;
+        logs: boolean;
+    };
+}

package/dist/cjs/types/options.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/dist/{types → cjs/types}/types.d.ts

@@ -19,16 +19,44 @@ export interface XernerxInteraction extends InteractionResponse {
     };
 }
 export interface XernerxUser extends User {
-    isOwner: boolean;
-}
-export interface XernerxRole extends Role {
-}
-export interface XernerxTextChannel extends TextChannel {
-}
-export interface XernerxGuild extends Guild {
-}
-export interface XernerxMember extends GuildMember {
+    owner: boolean;
+    voter?: boolean;
 }
+export interface XernerxRole extends Role {}
+export interface XernerxTextChannel extends TextChannel {}
+export interface XernerxGuild extends Guild {}
+export interface XernerxMember extends GuildMember {}
 export type MessageCommandArgsTypes = 'rest' | 'option' | 'flag' | 'string' | 'number' | 'channel' | 'user' | 'member' | 'boolean' | 'role';
-export type Localizations = 'id' | 'da' | 'de' | 'en-GB' | 'en-US' | 'es-ES' | 'fr' | 'hr' | 'it' | 'lt' | 'hu' | 'nl' | 'no' | 'pl' | 'pt-BR' | 'ro' | 'fi' | 'sv-SE' | 'vi' | 'tr' | 'cs' | 'el' | 'bg' | 'ru' | 'uk' | 'hi' | 'th' | 'zh-CN' | 'ja' | 'zh-TW' | 'ko';
+export type Localizations =
+    | 'id'
+    | 'da'
+    | 'de'
+    | 'en-GB'
+    | 'en-US'
+    | 'es-ES'
+    | 'fr'
+    | 'hr'
+    | 'it'
+    | 'lt'
+    | 'hu'
+    | 'nl'
+    | 'no'
+    | 'pl'
+    | 'pt-BR'
+    | 'ro'
+    | 'fi'
+    | 'sv-SE'
+    | 'vi'
+    | 'tr'
+    | 'cs'
+    | 'el'
+    | 'bg'
+    | 'ru'
+    | 'uk'
+    | 'hi'
+    | 'th'
+    | 'zh-CN'
+    | 'ja'
+    | 'zh-TW'
+    | 'ko';
 export type EventEmitterType = 'client' | 'process';

package/dist/cjs/types/types.js

@@ -0,0 +1,2 @@
+'use strict';
+Object.defineProperty(exports, '__esModule', { value: true });

package/dist/{utils → cjs/utils}/ClientUtil.d.ts

@@ -9,6 +9,7 @@ interface Presence {
 }
 export declare class ClientUtil {
     client: XernerxClient;
+    [index: string]: Function | XernerxClient;
     constructor(client: XernerxClient);
     uptime(timestamp: number | null): string;
     getSubcommands(name: string): object[];

package/dist/{utils → cjs/utils}/ClientUtil.js

@@ -1,12 +1,19 @@
-import XernerxError from '../tools/XernerxError.js';
-export class ClientUtil {
+'use strict';
+var __importDefault =
+    (this && this.__importDefault) ||
+    function (mod) {
+        return mod && mod.__esModule ? mod : { default: mod };
+    };
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.ClientUtil = void 0;
+const XernerxError_js_1 = __importDefault(require('../tools/XernerxError.js'));
+class ClientUtil {
     client;
     constructor(client) {
         this.client = client;
     }
     uptime(timestamp) {
-        if (!timestamp)
-            timestamp = this.client.uptime || 0;
+        if (!timestamp) timestamp = this.client.uptime || 0;
         let totalSeconds = timestamp / 1000;
         let years = Math.floor(totalSeconds / 31536000);
         totalSeconds %= 31536000;
@@ -16,90 +23,77 @@ export class ClientUtil {
         totalSeconds %= 3600;
         let minutes = Math.floor(totalSeconds / 60);
         let seconds = Math.floor(totalSeconds % 60);
-        if (years >= 1)
-            return `${years}y ${days}d ${hours}h ${minutes}m`;
-        else if (days >= 1)
-            return `${days}d ${hours}h ${minutes}m`;
-        else if (hours >= 1)
-            return `${hours}h ${minutes}m`;
-        else if (minutes >= 1)
-            return `${minutes}m ${seconds}s`;
-        else
-            return `${seconds}s`;
+        if (years >= 1) return `${years}y ${days}d ${hours}h ${minutes}m`;
+        else if (days >= 1) return `${days}d ${hours}h ${minutes}m`;
+        else if (hours >= 1) return `${hours}h ${minutes}m`;
+        else if (minutes >= 1) return `${minutes}m ${seconds}s`;
+        else return `${seconds}s`;
     }
     getSubcommands(name) {
-        if (!name || typeof name !== 'string')
-            throw new XernerxError(`Expected name to be of type string, received ${typeof name} instead!`);
+        if (!name || typeof name !== 'string') throw new XernerxError_js_1.default(`Expected name to be of type string, received ${typeof name} instead!`);
         const commands = [];
         this.getAllCommands()
             .filter((c) => (c.data?.name?.toLowerCase() || c.name?.toLowerCase()) == name?.toLowerCase())
             .map((c) => {
-            if (c?.data?.options?.length > 0) {
-                c?.data?.options?.map((option) => {
-                    if (!option?.type) {
-                        if (option?.options?.length > 0) {
-                            option?.options?.map((opt) => {
-                                if (!opt.type) {
-                                    commands.push({
-                                        name: c.data.name,
-                                        formattedName: `${c.data.name} ${option.name} ${opt.name}`,
-                                        description: opt.description,
-                                        category: c.category || null,
-                                        commandType: c.commandType,
-                                    });
-                                }
-                                else {
-                                    commands.push({
-                                        name: c.data.name,
-                                        formattedName: `${c.data.name} ${option.name}`,
-                                        description: option.description,
-                                        category: c.category || null,
-                                        commandType: c.commandType,
-                                    });
-                                }
-                            });
-                        }
-                        else {
+                if (c?.data?.options?.length > 0) {
+                    c?.data?.options?.map((option) => {
+                        if (!option?.type) {
+                            if (option?.options?.length > 0) {
+                                option?.options?.map((opt) => {
+                                    if (!opt.type) {
+                                        commands.push({
+                                            name: c.data.name,
+                                            formattedName: `${c.data.name} ${option.name} ${opt.name}`,
+                                            description: opt.description,
+                                            category: c.category || null,
+                                            commandType: c.commandType,
+                                        });
+                                    } else {
+                                        commands.push({
+                                            name: c.data.name,
+                                            formattedName: `${c.data.name} ${option.name}`,
+                                            description: option.description,
+                                            category: c.category || null,
+                                            commandType: c.commandType,
+                                        });
+                                    }
+                                });
+                            } else {
+                                commands.push({
+                                    name: c.data.name,
+                                    formattedName: `${c.data.name} ${option.name}`,
+                                    description: option.description,
+                                    category: c.category || null,
+                                    commandType: c.commandType,
+                                });
+                            }
+                        } else {
                             commands.push({
                                 name: c.data.name,
-                                formattedName: `${c.data.name} ${option.name}`,
-                                description: option.description,
+                                formattedName: `${c.data.name}`,
+                                description: c.data.description,
                                 category: c.category || null,
                                 commandType: c.commandType,
                             });
                         }
-                    }
-                    else {
-                        commands.push({
-                            name: c.data.name,
-                            formattedName: `${c.data.name}`,
-                            description: c.data.description,
-                            category: c.category || null,
-                            commandType: c.commandType,
-                        });
-                    }
-                });
-            }
-            else {
-                commands.push({
-                    name: c.data?.name || c.name,
-                    formattedName: `${c.data?.name || c.name}`,
-                    description: c.data?.description || c.description,
-                    category: c.category || null,
-                    commandType: c.commandType,
-                });
-            }
-        });
+                    });
+                } else {
+                    commands.push({
+                        name: c.data?.name || c.name,
+                        formattedName: `${c.data?.name || c.name}`,
+                        description: c.data?.description || c.description,
+                        category: c.category || null,
+                        commandType: c.commandType,
+                    });
+                }
+            });
         return commands;
     }
     isOwner(userId) {
-        if (!userId)
-            throw new XernerxError('No ID specified');
+        if (!userId) throw new XernerxError_js_1.default('No ID specified');
         let owners = this.client.settings.ownerId;
-        if (!owners)
-            return false;
-        if (typeof owners === 'string')
-            owners = [owners];
+        if (!owners) return false;
+        if (typeof owners === 'string') owners = [owners];
         return owners.includes(userId);
     }
     getAllCommands() {
@@ -148,8 +142,7 @@ export class ClientUtil {
     getCooldowns(id, command) {
         let cooldowns = [];
         for (const [key, value] of Object.entries(this.client.cache)) {
-            if (!['cooldowns', 'messageCommands', 'slashCommands', 'contextCommands', 'commands'].includes(key))
-                continue;
+            if (!['cooldowns', 'messageCommands', 'slashCommands', 'contextCommands', 'commands'].includes(key)) continue;
             if (key === 'commands') {
                 if (command) {
                     value.map((x) => {
@@ -159,16 +152,14 @@ export class ClientUtil {
                             cooldowns.push(x);
                         }
                     });
-                }
-                else {
+                } else {
                     value.map((x) => {
                         if (x.name.split(/-/).shift() === id) {
                             cooldowns.push(x);
                         }
                     });
                 }
-            }
-            else {
+            } else {
                 if (value.has(id)) {
                     const x = value.get(id);
                     cooldowns.push(x);
@@ -180,8 +171,7 @@ export class ClientUtil {
     getCooldownTimers(id, command) {
         let cooldowns = [];
         for (const [key, value] of Object.entries(this.client.cache)) {
-            if (!['cooldowns', 'messageCommands', 'slashCommands', 'contextCommands', 'commands'].includes(key))
-                continue;
+            if (!['cooldowns', 'messageCommands', 'slashCommands', 'contextCommands', 'commands'].includes(key)) continue;
             if (key === 'commands') {
                 if (command) {
                     value.map((x) => {
@@ -193,8 +183,7 @@ export class ClientUtil {
                             });
                         }
                     });
-                }
-                else {
+                } else {
                     value.map((x) => {
                         if (x.name.split(/-/).shift() === id) {
                             cooldowns.push({
@@ -203,8 +192,7 @@ export class ClientUtil {
                         }
                     });
                 }
-            }
-            else {
+            } else {
                 if (value.has(id)) {
                     const x = value.get(id);
                     cooldowns.push({ [key]: x.endsAt - Date.now() });
@@ -220,3 +208,4 @@ export class ClientUtil {
         return new Promise((resolve) => setTimeout(resolve, time || 0));
     }
 }
+exports.ClientUtil = ClientUtil;

package/dist/{utils → cjs/utils}/CommandUtil.d.ts

@@ -31,7 +31,7 @@ export declare class MessageCommandUtil {
     reply(content: MessagePayload | string): Promise<Message<boolean> | undefined>;
     send(content: MessagePayload | string): Promise<Message<true> | Message<false> | undefined>;
     defer(time: number): Promise<unknown>;
-    getCommands(): import("@discordjs/collection").Collection<string, import("../main.js").MessageCommandBuilder>;
+    getCommands(): import('@discordjs/collection').Collection<string, import('../main.js').MessageCommandBuilder>;
     getCommandName(): void;
     selectMenuPaginator(embeds: Array<EmbedBuilder>, options?: SelectMenuOptions): void;
     buttonPaginator(embeds: Array<EmbedBuilder>, options: ButtonOptions): void;
@@ -45,7 +45,9 @@ export declare class InteractionCommandUtil {
     constructor(client: XernerxClient, interaction: Interaction);
     reply(content: MessagePayload | string): any;
     defer(time: number): Promise<unknown>;
-    getCommands(): import("@discordjs/collection").Collection<string, import("../main.js").SlashCommandBuilder> | import("@discordjs/collection").Collection<string, import("../main.js").ContextCommandBuilder>;
+    getCommands():
+        | import('@discordjs/collection').Collection<string, import('../main.js').SlashCommandBuilder>
+        | import('@discordjs/collection').Collection<string, import('../main.js').ContextCommandBuilder>;
     getCommandName(): void;
     selectMenuPaginator(embeds: Array<EmbedBuilder>, options?: SelectMenuOptions): void;
     buttonPaginator(embeds: Array<EmbedBuilder>, options: ButtonOptions): void;