seyfert 2.1.1-dev-11415196258.0 → 2.1.1-dev-11420062278.0

package/lib/builders/types.d.ts

@@ -4,7 +4,7 @@ import type { TextInput } from './Modal';
 import type { BuilderSelectMenus } from './SelectMenu';
 export type ComponentCallback<T extends ComponentInteraction | StringSelectMenuInteraction = ComponentInteraction | StringSelectMenuInteraction> = (interaction: T, stop: ComponentStopCallback, refresh: ComponentRefreshCallback) => any;
 export type ComponentFilterCallback<T = ComponentInteraction> = (interaction: T) => any;
-export type ComponentStopCallback = (reason: 'messageDelete' | 'channelDelete' | 'guildDelete' | (string & {}) | undefined, refresh: ComponentRefreshCallback) => any;
+export type ComponentStopCallback = (reason: 'messageDelete' | 'channelDelete' | 'guildDelete' | 'idle' | 'timeout' | (string & {}) | undefined, refresh: ComponentRefreshCallback) => any;
 export type ComponentRefreshCallback = () => any;
 export type ModalSubmitCallback<T = ModalSubmitInteraction> = (interaction: T) => any;
 export type ButtonLink = Omit<Button, 'setCustomId'>;

package/lib/components/handler.d.ts

@@ -8,9 +8,10 @@ import { ComponentCommand } from './componentcommand';
 import type { ComponentContext } from './componentcontext';
 import { ModalCommand } from './modalcommand';
 import type { ModalContext } from './modalcontext';
+type UserMatches = string | string[] | RegExp;
 type COMPONENTS = {
     components: {
-        match: string | string[] | RegExp;
+        match: MatchCallback;
         callback: ComponentCallback;
     }[];
     options?: ListenerOptions;
@@ -19,12 +20,13 @@ type COMPONENTS = {
     guildId: string | undefined;
     idle?: NodeJS.Timeout;
     timeout?: NodeJS.Timeout;
-    __run: (customId: string | string[] | RegExp, callback: ComponentCallback) => any;
+    __run: (customId: UserMatches, callback: ComponentCallback) => any;
 };
+export type MatchCallback = (str: string) => boolean;
 export type CollectorInteraction = ComponentInteraction | StringSelectMenuInteraction;
 export type ComponentCommands = ComponentCommand | ModalCommand;
 export interface CreateComponentCollectorResult {
-    run<T extends CollectorInteraction = CollectorInteraction>(customId: string | string[] | RegExp, callback: ComponentCallback<T>): any;
+    run<T extends CollectorInteraction = CollectorInteraction>(customId: UserMatches, callback: ComponentCallback<T>): any;
     stop(reason?: string): any;
 }
 export declare class ComponentHandler extends BaseHandler {
@@ -35,9 +37,10 @@ export declare class ComponentHandler extends BaseHandler {
     readonly commands: ComponentCommands[];
     filter: (path: string) => boolean;
     constructor(logger: Logger, client: UsingClient);
+    private createMatchCallback;
     createComponentCollector(messageId: string, channelId: string, guildId: string | undefined, options?: ListenerOptions): CreateComponentCollectorResult;
     onComponent(id: string, interaction: ComponentInteraction): Promise<any>;
-    hasComponent(id: string, customId: string): boolean;
+    hasComponent(id: string, customId: string): boolean | undefined;
     resetTimeouts(id: string): void;
     hasModal(interaction: ModalSubmitInteraction): boolean;
     onModalSubmit(interaction: ModalSubmitInteraction): any;

package/lib/components/handler.js

@@ -18,6 +18,13 @@ class ComponentHandler extends common_1.BaseHandler {
         super(logger);
         this.client = client;
     }
+    createMatchCallback(match) {
+        if (typeof match === 'string')
+            return str => str === match;
+        if (Array.isArray(match))
+            return str => match.includes(str);
+        return str => match.test(str);
+    }
     createComponentCollector(messageId, channelId, guildId, options = {}) {
         this.values.set(messageId, {
             messageId,
@@ -45,7 +52,7 @@ class ComponentHandler extends common_1.BaseHandler {
                 if (this.values.has(messageId)) {
                     this.values.get(messageId).components.push({
                         callback,
-                        match: customId,
+                        match: this.createMatchCallback(customId),
                     });
                 }
             },
@@ -63,13 +70,7 @@ class ComponentHandler extends common_1.BaseHandler {
     }
     async onComponent(id, interaction) {
         const row = this.values.get(id);
-        const component = row?.components?.find(x => {
-            if (typeof x.match === 'string')
-                return x.match === interaction.customId;
-            if (Array.isArray(x.match))
-                return x.match.includes(interaction.customId);
-            return interaction.customId.match(x.match);
-        });
+        const component = row?.components?.find(x => x.match(interaction.customId));
         if (!component)
             return;
         if (row.options?.filter) {
@@ -87,13 +88,7 @@ class ComponentHandler extends common_1.BaseHandler {
         });
     }
     hasComponent(id, customId) {
-        return (this.values.get(id)?.components?.some(x => {
-            if (typeof x.match === 'string')
-                return x.match === customId;
-            if (Array.isArray(x.match))
-                return x.match.includes(customId);
-            return customId.match(x.match);
-        }) ?? false);
+        return this.values.get(id)?.components?.some(x => x.match(customId));
     }
     resetTimeouts(id) {
         const listener = this.values.get(id);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "2.1.1-dev-11415196258.0",
+	"version": "2.1.1-dev-11420062278.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",