xernerx 4.13.1 → 4.14.1

package/dist/client/XernerxShardClient.d.ts

@@ -16,6 +16,6 @@ export default class XernerxShardClient extends ShardingManager {
     };
     user: ClientUser | null;
     spawner: Promise<import("@discordjs/collection").Collection<number, import("discord.js").Shard>>;
-    constructor(file: string, discordOptions: ShardingManagerOptions, xernerxOptions?: XernerxOptions);
+    constructor(file: string, discordOptions: ShardingManagerOptions, xernerxOptions?: XernerxOptions, data?: unknown);
 }
 export {};

package/dist/client/XernerxShardClient.js

@@ -3,7 +3,7 @@ import { ShardingManager } from 'discord.js';
 import { Style } from 'dumfunctions';
 import XernerxLog from '../tools/XernerxLog.js';
 export default class XernerxShardClient extends ShardingManager {
-    constructor(file, discordOptions, xernerxOptions) {
+    constructor(file, discordOptions, xernerxOptions, data = {}) {
         super(file, discordOptions);
         this.stats = { guildCount: 0, userCount: 0, shardCount: 0, voteCount: 0, shards: {} };
         this.user = null;
@@ -18,6 +18,8 @@ export default class XernerxShardClient extends ShardingManager {
                 this.stats.userCount += stats.userCount;
                 this.stats.shardCount++;
                 this.stats.voteCount = stats.voteCount;
+                shard.send({ type: 'xernerx', data: { shardId: shard.id, sharded: true } });
+                shard.send({ type: 'client', data });
                 await new XernerxLog({ settings: xernerxOptions }).info(`Launched shard ${Style.log(String(shard.id), { color: Style.TextColor.Cyan })} for ${Style.log(this.user?.tag, { color: Style.TextColor.Blue })}! ${xernerxOptions?.timeout ? `Automatically killing in ${Style.log(String(xernerxOptions.timeout), { color: Style.TextColor.Cyan })}ms.` : ''}`);
             })
                 .on('error', (error) => {

package/dist/functions/deploy.js

@@ -9,8 +9,14 @@ export default function deploy(client) {
     const commands = [];
     function stats() {
         client.stats.guildCount = client.guilds.cache.size;
-        client.stats.userCount = client.guilds.cache.map((g) => g.memberCount || g.approximateMemberCount || 0).reduce((a, b) => (a += b));
+        client.stats.userCount = client.guilds.cache.map((g) => g.memberCount || g.approximateMemberCount || 0).reduce((a, b) => (a += b), 0);
     }
+    process.on('message', (message) => {
+        if (message.type == 'xernerx')
+            client.stats.shardId = message?.data?.shardId;
+        if (message.type == 'client')
+            client.data = message.data;
+    });
     client.on('messageCreate', stats);
     client.on('interactionCreate', stats);
     client.prependOnceListener('ready', (client) => {

package/dist/handlers/CommandHandler.js

@@ -273,7 +273,7 @@ export default class CommandHandler extends Handler {
             await this.client.emit('commandStart', interaction);
             const args = await interactionArguments(interaction, cmd);
             interaction.util.parsed = {
-                alias: [interaction.commandName, args.group || '', args.subcommand || ''].join(' '),
+                alias: [interaction.commandName, args.group || null, args.subcommand || null].filter((x) => x).join(' '),
                 args: args.args,
             };
             cmd.util = interaction.util;

package/dist/tools/XernerxLog.d.ts

@@ -10,10 +10,19 @@ export default class XernerxLog {
     private readonly readyLog;
     private readonly tableLog;
     private readonly time;
+    private readonly ram;
+    private shard;
+    private readonly base;
     constructor(client: XernerxClient | XernerxClientType | true);
     info(message: string, force?: boolean): void | null;
     warn(message: string): void | null;
     update(version: string, url: string): Promise<void>;
     error(message: string, error?: XernerxError | unknown): void | null;
     ready(): void;
+    private cyan;
+    private blue;
+    private yellow;
+    private purple;
+    private red;
+    private green;
 }

package/dist/tools/XernerxLog.js

@@ -16,41 +16,38 @@ export default class XernerxLog {
             this.tableLog = client.settings.log?.table;
         }
         this.time = () => String(new Date()).split(/ +/)[4];
+        this.ram = () => Math.round(process.memoryUsage().rss / 1000000);
+        this.shard = '';
+        process.on('message', (message) => {
+            if (message.type == 'xernerx')
+                this.shard = message?.data?.sharded ? `| ${message?.data?.shardId} |` : '';
+        });
+        this.base = (type, message) => `${type == 'info' ? `✔️  | ${this.purple('Xernerx')}` : type == `error` ? `❗ | ${this.red('Xernerx')}` : type == `update` ? `⬆️  | ${this.blue('Xernerx')}` : `⚠️  | ${this.yellow('Xernerx')}`} | ${this.cyan(this.time())} | ${this.cyan(this.ram())}mb | ${this.client.stats?.shardCount > 1 ? `${this.cyan(this.client.stats.shardId)} | ` : ''}${message}`;
     }
     info(message, force = false) {
-        return this.infoLog || force
-            ? console.info(`✔️  | ${Style.log('Xernerx', { color: Style.TextColor.Purple })} | ${Style.log(this.time(), {
-                color: Style.TextColor.Cyan,
-            })} | ${Math.round(process.memoryUsage().rss / 1000000)}mb | ${message}`)
-            : null;
+        return this.infoLog || force ? console.info(this.base('info', message)) : null;
     }
     warn(message) {
-        return this.warnLog
-            ? console.warn(`⚠️  | ${Style.log('Xernerx', { color: Style.TextColor.Yellow })} | ${Style.log(this.time(), { color: Style.TextColor.Cyan })} | ${Math.round(process.memoryUsage().rss / 1000000)}mb | ${message}`)
-            : null;
+        return this.warnLog ? console.warn(this.base('warn', message)) : null;
     }
     async update(version, url) {
         const pkg = await fetch(url)
             .then(async (res) => await res.json())
             .catch(() => ({ version }));
         if (version !== pkg.version)
-            new XernerxLog(true).warn(`A new version for ${pkg.name} is available, you're using version ${Style.log(version, { color: Style.TextColor.Cyan })}, new version is ${Style.log(pkg.version, {
-                color: Style.TextColor.Cyan,
-            })}, run ${Style.log(`npm i ${pkg.name}@${pkg.version}`, { color: Style.BackgroundColor.Grey })} to update to the latest version.`);
+            console.info(this.base('update', `A new version for ${pkg.name} is available, you're using version ${this.cyan(version)}, new version is ${this.cyan(pkg.version)}, run ${Style.log(`npm i ${pkg.name}@${pkg.version}`, {
+                color: Style.BackgroundColor.Grey,
+            })} to update to the latest version.`));
     }
     error(message, error) {
-        return this.errorLog
-            ? console.error(`❗ | ${Style.log('Xernerx', { color: Style.TextColor.Red })} | ${Style.log(this.time(), { color: Style.TextColor.Cyan })} | ${Math.round(process.memoryUsage().rss / 1000000)}mb | ${message}${error ? ` | ${error.stack}` : ''}`)
-            : null;
+        return this.errorLog ? console.error(this.base('error', message), error) : null;
     }
     ready() {
         if (typeof this.client == 'boolean')
             return;
         const client = this.client;
         this.client.prependOnceListener('ready', async (synced) => {
-            this.info(`${Style.log(synced.user.tag, { color: Style.TextColor.Blue })} is now ${Style.log('online', { color: Style.TextColor.Green })}, watching ${Style.log(String(client.guilds.cache.size), {
-                color: Style.TextColor.Cyan,
-            })} guild${client.guilds.cache.size > 1 ? 's' : ''}, using ${client.settings.local ? Style.log((await client.guilds.fetch(client.settings.local))?.name, { color: Style.TextColor.Blue }) : 'none'} as local guild.`, this.readyLog);
+            this.info(`${Style.log(synced.user.tag, { color: Style.TextColor.Blue })} is now ${this.green('online')}, watching ${this.cyan(String(client.guilds.cache.size))} guild${client.guilds.cache.size > 1 ? 's' : ''}, using ${client.settings.local ? this.blue((await client.guilds.fetch(client.settings.local))?.name) : 'none'} as local guild.`, this.readyLog);
             const files = [];
             for (const [id, data] of client.commands.message) {
                 files.push(data);
@@ -77,4 +74,22 @@ export default class XernerxLog {
             }
         });
     }
+    cyan(string) {
+        return Style.log(String(string), { color: Style.TextColor.Cyan });
+    }
+    blue(string) {
+        return Style.log(String(string), { color: Style.TextColor.Blue });
+    }
+    yellow(string) {
+        return Style.log(String(string), { color: Style.TextColor.Yellow });
+    }
+    purple(string) {
+        return Style.log(String(string), { color: Style.TextColor.Purple });
+    }
+    red(string) {
+        return Style.log(String(string), { color: Style.TextColor.Red });
+    }
+    green(string) {
+        return Style.log(String(string), { color: Style.TextColor.Green });
+    }
 }

package/dist/utils/ClientUtil.d.ts

@@ -11,8 +11,9 @@ export default class ClientUtil extends Util {
     constructor(client: XernerxClient);
     setPresence(options: PresenceOptions): import("discord.js").ClientPresence | undefined;
     private resolveCooldown;
-    resolveCommand(options: ResolveCommandOptions): XernerxMessageCommand | XernerxSlashCommand | XernerxContextCommand | Collection<string, XernerxMessageCommand | XernerxSlashCommand | XernerxContextCommand>;
+    resolveCommand(options: ResolveCommandOptions): XernerxSlashCommand | XernerxContextCommand | XernerxMessageCommand | Collection<string, XernerxSlashCommand | XernerxContextCommand | XernerxMessageCommand>;
     resolveChannel(query: string | Record<string, string>): Promise<import("discord.js").Channel | null>;
     resolveGuild(query: string | Record<string, string>): Promise<import("discord.js").Guild | null>;
     uptime(timestamp?: number | null): string;
+    commands(): ([string, XernerxMessageCommand] | [string, XernerxSlashCommand] | [string, XernerxContextCommand])[];
 }

package/dist/utils/ClientUtil.js

@@ -75,4 +75,7 @@ export default class ClientUtil extends Util {
         else
             return `${seconds}s`;
     }
+    commands() {
+        return [...this.client.commands.context, ...this.client.commands.slash, ...this.client.commands.message];
+    }
 }

package/dist/utils/InteractionUtil.d.ts

@@ -18,7 +18,7 @@ export default class InteractionUtil extends Util {
     send(content: any): Promise<import("discord.js").Message<false> | import("discord.js").Message<true> | undefined>;
     reply(content: string | MessagePayload | InteractionReplyOptions | InteractionEditReplyOptions): Promise<import("discord.js").InteractionResponse<boolean> | import("discord.js").Message<boolean>>;
     mimic(user: XernerxUser | string, interaction: MessageCreateOptions, options: MimicOptions): Promise<void>;
-    private commandName;
     paginator(embeds: Array<EmbedBuilder>, options?: PaginatorOptions): Promise<void | import("discord.js").Message<false> | import("discord.js").Message<true>>;
+    commands(): import("@discordjs/collection").Collection<string, import("../main.js").XernerxSlashCommand> | import("@discordjs/collection").Collection<string, import("../main.js").XernerxContextCommand>;
 }
 export {};

package/dist/utils/InteractionUtil.js

@@ -1,5 +1,5 @@
 /** @format */
-import { ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, } from 'discord.js';
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle, InteractionType, StringSelectMenuBuilder, } from 'discord.js';
 import Util from './Util.js';
 import XernerxError from '../tools/XernerxError.js';
 export default class InteractionUtil extends Util {
@@ -38,8 +38,6 @@ export default class InteractionUtil extends Util {
             webhook.delete().catch(() => true);
         }, options.timeout);
     }
-    // @ts-ignore
-    commandName() { }
     async paginator(embeds, options = {}) {
         let buttonRow, menuRow;
         if (embeds.length <= 0)
@@ -120,4 +118,10 @@ export default class InteractionUtil extends Util {
                 });
             });
     }
+    commands() {
+        if (this.interaction.type == InteractionType.ApplicationCommand)
+            return this.client.commands.slash;
+        else
+            return this.client.commands.context;
+    }
 }

package/dist/utils/MessageUtil.d.ts

@@ -19,5 +19,6 @@ export default class MessageUtil extends Util {
     reply(content: string | MessagePayload | MessageReplyOptions | MessageEditOptions): Promise<import("discord.js").Message<boolean> | null>;
     mimic(user: XernerxUser | string, message: MessageCreateOptions, options: MimicOptions): Promise<void>;
     paginator(embeds: Array<EmbedBuilder>, options?: PaginatorOptions): Promise<void | import("discord.js").Message<boolean> | null>;
+    commands(): import("@discordjs/collection").Collection<string, import("../main.js").XernerxMessageCommand>;
 }
 export {};

package/dist/utils/MessageUtil.js

@@ -135,4 +135,7 @@ export default class MessageUtil extends Util {
                 });
             });
     }
+    commands() {
+        return this.client.commands.message;
+    }
 }

package/dist/validators/inhibitorValidations.d.ts

@@ -6,4 +6,4 @@ import XernerxSlashCommand from '../build/XernerxSlashCommand.js';
 import { XernerxMessage, XernerxMessageContextInteraction, XernerxSlashInteraction, XernerxUserContextInteraction } from '../types/extenders.js';
 import { InhibitorType, XernerxInteraction } from '../types/types.js';
 export declare function inhibitorValidation(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, args?: SlashCommandArguments | MessageCommandArguments | ContextCommandArguments<'user' | 'message'> | null, cmd?: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand, type?: 'pre' | 'check' | 'post'): Promise<boolean>;
-export declare function inhibitorArguments(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, cmd: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand | null, type: InhibitorType): import("../types/extenders.js").XernerxUser | import("discord.js").GuildMember | import("discord.js").Guild | import("discord.js").TextBasedChannel | XernerxMessageCommand | XernerxSlashCommand | XernerxContextCommand | import("discord.js").APIInteractionGuildMember | null | undefined;
+export declare function inhibitorArguments(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, cmd: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand | null, type: InhibitorType): import("../types/extenders.js").XernerxUser | import("discord.js").GuildMember | import("discord.js").Guild | import("discord.js").TextBasedChannel | XernerxSlashCommand | XernerxContextCommand | XernerxMessageCommand | import("discord.js").APIInteractionGuildMember | null | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "4.13.1",
+	"version": "4.14.1",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
 	"type": "module",