seyfert 1.2.3 → 1.3.1

package/lib/common/types/write.d.ts

@@ -1,17 +1,20 @@
-import type { APIActionRowComponent, APIEmbed, APIInteractionResponseCallbackData, APIInteractionResponseChannelMessageWithSource, APIMessageActionRowComponent, APIModalInteractionResponse, RESTPatchAPIChannelMessageJSONBody, RESTPatchAPIWebhookWithTokenMessageJSONBody, RESTPostAPIChannelMessageJSONBody, RESTPostAPIWebhookWithTokenJSONBody } from 'discord-api-types/v10';
+import type { APIActionRowComponent, APIEmbed, APIInteractionResponseCallbackData, APIInteractionResponseChannelMessageWithSource, APIMessageActionRowComponent, APIModalInteractionResponse, RESTAPIPollCreate, RESTPatchAPIChannelMessageJSONBody, RESTPatchAPIWebhookWithTokenMessageJSONBody, RESTPostAPIChannelMessageJSONBody, RESTPostAPIWebhookWithTokenJSONBody } from 'discord-api-types/v10';
 import type { RawFile } from '../../api';
-import type { ActionRow, Attachment, AttachmentBuilder, BuilderComponents, Embed, Modal } from '../../builders';
+import type { ActionRow, Attachment, AttachmentBuilder, BuilderComponents, Embed, Modal, PollBuilder } from '../../builders';
 import type { OmitInsert } from './util';
 export interface ResolverProps {
     embeds?: Embed[] | APIEmbed[] | undefined;
     components?: APIActionRowComponent<APIMessageActionRowComponent>[] | ActionRow<BuilderComponents>[] | undefined;
     files?: AttachmentBuilder[] | Attachment[] | RawFile[] | undefined;
 }
-export type MessageCreateBodyRequest = OmitInsert<RESTPostAPIChannelMessageJSONBody, 'components' | 'embeds', ResolverProps>;
+export interface SendResolverProps extends ResolverProps {
+    poll?: PollBuilder | RESTAPIPollCreate | undefined;
+}
+export type MessageCreateBodyRequest = OmitInsert<RESTPostAPIChannelMessageJSONBody, 'components' | 'embeds' | 'poll', SendResolverProps>;
 export type MessageUpdateBodyRequest = OmitInsert<RESTPatchAPIChannelMessageJSONBody, 'components' | 'embeds', ResolverProps>;
-export type MessageWebhookCreateBodyRequest = OmitInsert<RESTPostAPIWebhookWithTokenJSONBody, 'components' | 'embeds', ResolverProps>;
+export type MessageWebhookCreateBodyRequest = OmitInsert<RESTPostAPIWebhookWithTokenJSONBody, 'components' | 'embeds' | 'poll', SendResolverProps>;
 export type MessageWebhookUpdateBodyRequest = OmitInsert<RESTPatchAPIWebhookWithTokenMessageJSONBody, 'components' | 'embeds', ResolverProps>;
 export type InteractionMessageUpdateBodyRequest = OmitInsert<RESTPatchAPIWebhookWithTokenMessageJSONBody, 'components' | 'embeds', ResolverProps>;
 export type ComponentInteractionMessageUpdate = OmitInsert<APIInteractionResponseCallbackData, 'components' | 'embeds', ResolverProps>;
-export type InteractionCreateBodyRequest = OmitInsert<APIInteractionResponseChannelMessageWithSource['data'], 'components' | 'embeds', ResolverProps>;
+export type InteractionCreateBodyRequest = OmitInsert<APIInteractionResponseChannelMessageWithSource['data'], 'components' | 'embeds' | 'poll', SendResolverProps>;
 export type ModalCreateBodyRequest = APIModalInteractionResponse['data'] | Modal;

package/lib/components/ButtonComponent.js

@@ -8,7 +8,7 @@ class LinkButtonComponent extends BaseComponent_1.BaseComponent {
         return this.data.style;
     }
     get url() {
-        // @ts-ignore
+        // @ts-expect-error
         return this.data.url;
     }
     get label() {

package/lib/components/componentcontext.d.ts

@@ -46,7 +46,7 @@ export declare class ComponentContext<Type extends keyof ComponentCommandInterac
      * Edits the response of the interaction.
      * @param body - The updated body of the response.
      */
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
     /**
      * Updates the interaction with new data.
      * @param body - The updated body of the interaction.

package/lib/components/handler.d.ts

@@ -16,23 +16,6 @@ type COMPONENTS = {
     timeout?: NodeJS.Timeout;
     __run: (customId: string | string[] | RegExp, callback: ComponentCallback) => any;
 };
-export interface ComponentHandlerLike {
-    readonly values: Map<string, COMPONENTS>;
-    readonly commands: (ComponentCommand | ModalCommand)[];
-    readonly modals: Map<string, ModalSubmitCallback> | LimitedCollection<string, ModalSubmitCallback>;
-    onFail: ComponentHandler['onFail'];
-    createComponentCollector: ComponentHandler['createComponentCollector'];
-    hasModal: ComponentHandler['hasModal'];
-    onModalSubmit: ComponentHandler['onModalSubmit'];
-    executeModal: ComponentHandler['executeModal'];
-    hasComponent: ComponentHandler['hasComponent'];
-    executeComponent: ComponentHandler['executeComponent'];
-    onComponent: ComponentHandler['onComponent'];
-    load: ComponentHandler['load'];
-    reload: ComponentHandler['reload'];
-    reloadAll: ComponentHandler['reloadAll'];
-    onMessageDelete: ComponentHandler['onMessageDelete'];
-}
 export declare class ComponentHandler extends BaseHandler {
     protected client: UsingClient;
     onFail: OnFailCallback;
@@ -57,5 +40,11 @@ export declare class ComponentHandler extends BaseHandler {
     reloadAll(): Promise<void>;
     executeComponent(interaction: ComponentInteraction): Promise<void>;
     executeModal(interaction: ModalSubmitInteraction): Promise<void>;
+    setHandlers({ callback }: {
+        callback: ComponentHandler['callback'];
+    }): void;
+    callback: (file: {
+        new (): ModalCommand | ComponentCommand;
+    }) => ModalCommand | ComponentCommand | false;
 }
 export {};

package/lib/components/handler.js

@@ -121,7 +121,9 @@ class ComponentHandler extends common_1.BaseHandler {
         for (let i = 0; i < paths.length; i++) {
             let component;
             try {
-                component = new paths[i].file();
+                component = this.callback(paths[i].file);
+                if (!component)
+                    continue;
             }
             catch (e) {
                 if (e instanceof Error && e.message === 'paths[i].file is not a constructor') {
@@ -138,7 +140,6 @@ class ComponentHandler extends common_1.BaseHandler {
                 continue;
             component.__filePath = paths[i].path;
             this.commands.push(component);
-            await this.__callback?.(component);
         }
     }
     async reload(path) {
@@ -201,5 +202,9 @@ class ComponentHandler extends common_1.BaseHandler {
             }
         }
     }
+    setHandlers({ callback }) {
+        this.callback = callback;
+    }
+    callback = (file) => new file();
 }
 exports.ComponentHandler = ComponentHandler;

package/lib/events/handler.d.ts

@@ -1,23 +1,14 @@
 import type { GatewayDispatchPayload } from 'discord-api-types/v10';
 import type { Client, WorkerClient } from '../client';
-import { BaseHandler, type MakeRequired, type OnFailCallback, type SnakeCase } from '../common';
+import { BaseHandler, type MakeRequired, type SnakeCase } from '../common';
 import type { ClientEvents } from '../events/hooks';
 import type { ClientEvent, ClientNameEvents } from './event';
-type EventValue = MakeRequired<ClientEvent, '__filePath'> & {
+export type EventValue = MakeRequired<ClientEvent, '__filePath'> & {
     fired?: boolean;
 };
-type GatewayEvents = Uppercase<SnakeCase<keyof ClientEvents>>;
-export interface EventHandlerLike {
-    runEvent: EventHandler['runEvent'];
-    execute: EventHandler['execute'];
-    load: EventHandler['load'];
-    reload: EventHandler['reload'];
-    reloadAll: EventHandler['reloadAll'];
-    values: EventHandler['values'];
-    onFail: EventHandler['onFail'];
-}
+export type GatewayEvents = Uppercase<SnakeCase<keyof ClientEvents>>;
 export declare class EventHandler extends BaseHandler {
-    onFail: OnFailCallback;
+    onFail: (event: GatewayEvents, err: unknown) => void;
     protected filter: (path: string) => boolean;
     values: Partial<Record<GatewayEvents, EventValue>>;
     load(eventsDir: string): Promise<void>;
@@ -25,5 +16,8 @@ export declare class EventHandler extends BaseHandler {
     runEvent(name: GatewayEvents, client: Client | WorkerClient, packet: any, shardId: number): Promise<void>;
     reload(name: ClientNameEvents): Promise<any>;
     reloadAll(): Promise<void>;
+    setHandlers({ callback }: {
+        callback: EventHandler['callback'];
+    }): void;
+    callback: (file: ClientEvent) => ClientEvent | false;
 }
-export {};

package/lib/events/handler.js

@@ -27,19 +27,20 @@ exports.EventHandler = void 0;
 const common_1 = require("../common");
 const RawEvents = __importStar(require("../events/hooks"));
 class EventHandler extends common_1.BaseHandler {
-    onFail = err => this.logger.warn('<Client>.events.onFail', err);
+    onFail = (event, err) => this.logger.warn('<Client>.events.onFail', err, event);
     filter = (path) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts'));
     values = {};
     async load(eventsDir) {
         for (const i of await this.loadFilesK(await this.getFiles(eventsDir))) {
-            const instance = i.file;
+            const instance = this.callback(i.file);
+            if (!instance)
+                continue;
             if (typeof instance?.run !== 'function') {
                 this.logger.warn(i.path.split(process.cwd()).slice(1).join(process.cwd()), 'Missing run function, use `export default {...}` syntax');
                 continue;
             }
             instance.__filePath = i.path;
             this.values[common_1.ReplaceRegex.snake(instance.data.name).toUpperCase()] = instance;
-            await this.__callback?.(instance);
         }
     }
     async execute(name, ...args) {
@@ -95,7 +96,7 @@ class EventHandler extends common_1.BaseHandler {
             await Event.run(...[hook, client, shardId]);
         }
         catch (e) {
-            await this.onFail(e);
+            await this.onFail(name, e);
         }
     }
     async reload(name) {
@@ -114,5 +115,9 @@ class EventHandler extends common_1.BaseHandler {
             await this.reload(common_1.ReplaceRegex.camel(i));
         }
     }
+    setHandlers({ callback }) {
+        this.callback = callback;
+    }
+    callback = (file) => file;
 }
 exports.EventHandler = EventHandler;

package/lib/events/hooks/auto_moderation.d.ts

@@ -5,7 +5,11 @@ export declare const AUTO_MODERATION_ACTION_EXECUTION: (_self: BaseClient, data:
     guildId: string;
     action: {
         type: import("discord-api-types/v10").AutoModerationActionType;
-        metadata?: import("discord-api-types/v10").APIAutoModerationActionMetadata | undefined;
+        metadata?: {
+            channelId?: string | undefined;
+            durationSeconds?: number | undefined;
+            customMessage?: string | undefined;
+        } | undefined;
     };
     ruleId: string;
     ruleTriggerType: import("discord-api-types/v10").AutoModerationRuleTriggerType;