xernerx 4.6.2 → 4.7.0

package/dist/build/XernerxInhibitor.d.ts

@@ -16,10 +16,12 @@ export default class XernerxInhibitor {
     readonly filepath: string;
     readonly client: XernerxClientType;
     constructor(id: string, options: XernerxInhibitorOptions);
+    pre(interaction: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, args: any): void;
     /**
      * @description The check rule
      * @param interaction - The interaction with the inhibitor, can be message and interaction
      * @param args - The arguments parsed with this command
      */
     check<T extends XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>>(interaction: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, args: (T extends XernerxMessage ? MessageCommandArguments : T extends XernerxSlashInteraction ? SlashCommandArguments : T extends XernerxUserContextInteraction ? ContextCommandArguments<'user' | 'message'> : never) | null, command: XernerxSlashCommand | XernerxMessageCommand | XernerxContextCommand): Promise<any>;
+    post<T extends XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>>(interaction: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, args: (T extends XernerxMessage ? MessageCommandArguments : T extends XernerxSlashInteraction ? SlashCommandArguments : T extends XernerxUserContextInteraction ? ContextCommandArguments<'user' | 'message'> : never) | null, command: XernerxSlashCommand | XernerxMessageCommand | XernerxContextCommand): Promise<any>;
 }

package/dist/build/XernerxInhibitor.js

@@ -1,6 +1,5 @@
 /** @format */
 import { z } from 'zod';
-import { XernerxLog } from '../main.js';
 /**
  * @description - The inhibitor builder for inhibitors.
  * @param {String} id - The unique ID of the inhibitor.
@@ -17,13 +16,12 @@ export default class XernerxInhibitor {
         this.type = options.type;
         this.client = this.client;
     }
+    pre(interaction, args) { }
     /**
      * @description The check rule
      * @param interaction - The interaction with the inhibitor, can be message and interaction
      * @param args - The arguments parsed with this command
      */
-    async check(interaction, args, command) {
-        new XernerxLog(this.client).error(`${this.id} doesn't have a check rule.`);
-        return await this.client.emit('commandError', interaction, `${this.name} doesn't have a check rule.`, this, this.filetype);
-    }
+    async check(interaction, args, command) { }
+    async post(interaction, args, command) { }
 }

package/dist/client/XernerxClient.d.ts

@@ -15,12 +15,12 @@ export default class XernerxClient<T = unknown> extends Client {
         } | undefined;
         ignore?: {
             owner: boolean;
-            self: boolean;
-            bots: boolean;
-            system: boolean;
             users: string[];
             channels: string[];
             guilds: string[];
+            self: boolean;
+            bots: boolean;
+            system: boolean;
         } | undefined;
         log?: boolean | {
             ready: boolean;

package/dist/handlers/CommandHandler.js

@@ -150,6 +150,8 @@ export default class CommandHandler extends Handler {
             return;
         message.util = new MessageUtil(this.client, message);
         message.user = await xernerxUser(message, this.client);
+        if (await inhibitorValidation(message, undefined, undefined, 'pre'))
+            return;
         if (typeof message2 === 'object')
             message = message2;
         if (message2 === 'delete' && this.client.modules.options.message?.handleDeletes) {
@@ -241,6 +243,8 @@ export default class CommandHandler extends Handler {
         const filetype = 'SlashCommand';
         interaction.util = new InteractionUtil(this.client, interaction);
         interaction.user = await xernerxUser(interaction, this.client);
+        if (await inhibitorValidation(interaction, undefined, undefined, 'pre'))
+            return;
         let cmd = null;
         if (this.client.commands.slash.has(interaction.commandName))
             cmd = this.client.commands.slash.get(interaction.commandName);
@@ -265,6 +269,8 @@ export default class CommandHandler extends Handler {
         const filetype = 'ContextCommand';
         interaction.util = new InteractionUtil(this.client, interaction);
         interaction.user = await xernerxUser(interaction, this.client);
+        if (await inhibitorValidation(interaction, undefined, undefined, 'pre'))
+            return;
         let cmd;
         if (this.client.commands.context.has(interaction.commandName))
             cmd = this.client.commands.context.get(interaction.commandName);
@@ -275,18 +281,24 @@ export default class CommandHandler extends Handler {
     }
     async exec(cmd, event, args, type) {
         try {
-            if (cmd.filetype !== 'MessageCommand' && (cmd?.defer?.reply ?? this.client.modules.options.slash?.defer?.reply)) {
+            if (cmd.filetype == 'SlashCommand' && (cmd?.defer?.reply ?? this.client.modules.options.slash?.defer?.reply)) {
                 await event.deferReply({
                     ephemeral: cmd.defer?.ephemeral || this.client.modules.options.slash?.defer?.ephemeral || false,
                 });
             }
+            if (cmd.filetype == 'ContextCommand' && (cmd?.defer?.reply ?? this.client.modules.options.context?.defer?.reply)) {
+                await event.deferReply({
+                    ephemeral: cmd.defer?.ephemeral || this.client.modules.options.context?.defer?.ephemeral || false,
+                });
+            }
             if (await commandValidation(event, cmd))
                 return;
-            if (await inhibitorValidation(event, args, cmd))
+            if (await inhibitorValidation(event, args, cmd, 'check'))
                 return;
             if (cmd.conditions && (await cmd.conditions(event, args)))
                 return;
             await cmd.exec(event, args);
+            await inhibitorValidation(event, args, cmd, 'post');
             return await this.client.emit('commandFinish', event, type);
         }
         catch (error) {

package/dist/types/types.d.ts

@@ -11,4 +11,4 @@ export type DiscordEventType = 'applicationCommandPermissionsUpdate' | 'autoMode
 export type XernerxEventType = DiscordEventType | 'webhookCreate' | 'webhookError' | 'commandBlock' | 'commandError' | 'commandStart' | 'commandFinish' | 'commandCooldown';
 export type XernerxInteraction<T extends XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction> = T extends XernerxSlashInteraction ? XernerxSlashInteraction : T extends XernerxUserContextInteraction ? XernerxUserContextInteraction : XernerxMessageContextInteraction;
 export type PermissionNames = 'create instant invite' | 'kick members' | 'ban members' | 'administrator' | 'manage channels' | 'manage guild' | 'add reactions' | 'view audit log' | 'priority speaker' | 'stream' | 'view channel' | 'send messages' | 'send tts messages' | 'manage messages' | 'embed links' | 'attach files' | 'read message history' | 'mention everyone' | 'use external emojis' | 'view guild insights' | 'connect' | 'speak' | 'mute members' | 'deafen members' | 'move members' | 'use vad' | 'change nickname' | 'manage nicknames' | 'manage roles' | 'manage webhooks' | 'manage emojis and stickers' | 'use application commands' | 'request to speak' | 'manage events' | 'manage threads' | 'create public threads' | 'create private threads' | 'use external stickers' | 'send messages in threads' | 'start embedded activities' | 'moderate members';
-export type InhibitorType = 'message' | 'interaction' | 'command' | 'channel' | 'user' | 'member' | 'guild' | 'contextCommand' | 'messageCommand' | 'slashCommand';
+export type InhibitorType = '*' | 'message' | 'interaction' | 'command' | 'channel' | 'user' | 'member' | 'guild' | 'contextCommand' | 'messageCommand' | 'slashCommand';

package/dist/validators/inhibitorValidations.d.ts

@@ -2,5 +2,5 @@
 import { ContextCommandArguments, MessageCommandArguments, SlashCommandArguments, XernerxContextCommand, XernerxMessageCommand, XernerxSlashCommand } from '../main.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): Promise<boolean>;
-export declare function inhibitorArguments(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, cmd: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand | null, type: InhibitorType): import("../main.js").XernerxUser | import("discord.js").GuildMember | import("discord.js").Guild | import("discord.js").TextBasedChannel | XernerxMessageCommand | XernerxSlashCommand | XernerxContextCommand | import("../main.js").APIInteractionGuildMember | null;
+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("../main.js").XernerxUser | import("discord.js").GuildMember | import("discord.js").Guild | import("discord.js").TextBasedChannel | XernerxMessageCommand | XernerxSlashCommand | XernerxContextCommand | import("../main.js").APIInteractionGuildMember | null | undefined;

package/dist/validators/inhibitorValidations.js

@@ -1,11 +1,20 @@
 /** @format */
-export async function inhibitorValidation(event, args, cmd) {
+export async function inhibitorValidation(event, args, cmd, type) {
     const client = event.client;
     const inhibits = [];
     for (const [name, inhibitor] of client.inhibitors) {
-        if (Boolean(await inhibitor.check(event, args, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
-            inhibits.push(name);
-        }
+        if (type == 'pre')
+            if (Boolean(await inhibitor.pre(event, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
+        if (type == 'check')
+            if (Boolean(await inhibitor.check(event, args || null, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
+        if (type == 'post')
+            if (Boolean(await inhibitor.post(event, args || null, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
     }
     return !!inhibits.length;
 }
@@ -14,9 +23,9 @@ export function inhibitorArguments(event, cmd, type) {
         case 'channel':
             return event.channel || null;
         case 'command':
-            return cmd;
+            return cmd || null;
         case 'contextCommand':
-            return cmd;
+            return cmd || null;
         case 'guild':
             return event.guild || null;
         case 'interaction':
@@ -26,10 +35,10 @@ export function inhibitorArguments(event, cmd, type) {
         case 'message':
             return null;
         case 'messageCommand':
-            return cmd;
+            return cmd || null;
         case 'slashCommand':
-            return cmd;
+            return cmd || null;
         case 'user':
-            return event.user;
+            return event.user || null;
     }
 }

package/package.json

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