seyfert 1.3.2 → 1.4.0

package/lib/langs/handler.js

@@ -30,10 +30,10 @@ class LangsHandler extends common_1.BaseHandler {
         const locale = this.getLocale(userLocale);
         return (0, router_1.LangRouter)(locale, this.defaultLang ?? locale, this.values)();
     }
-    async load(dir) {
-        const files = await this.loadFilesK(await this.getFiles(dir));
+    async load(dir, instances) {
+        const files = instances ?? (await this.loadFilesK(await this.getFiles(dir)));
         for (const i of files) {
-            const locale = i.name.split('.').slice(0, -1).join('.');
+            const locale = i.name.split('.').slice(0, -1).join('.') || i.name;
             const result = this.callback(locale, i.file);
             if (result)
                 this.values[locale] = result;

package/lib/structures/Interaction.d.ts

@@ -27,8 +27,8 @@ export declare class BaseInteraction<FromGuild extends boolean = boolean, Type e
     replied?: Promise<boolean> | boolean;
     appPermissions?: PermissionsBitField;
     constructor(client: UsingClient, interaction: Type, __reply?: __InternalReplyFunction | undefined);
-    static transformBodyRequest(body: ReplyInteractionBody): APIInteractionResponse;
-    static transformBody<T>(body: InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest): T;
+    static transformBodyRequest(body: ReplyInteractionBody, self: UsingClient): APIInteractionResponse;
+    static transformBody<T>(body: InteractionMessageUpdateBodyRequest | MessageUpdateBodyRequest | MessageCreateBodyRequest | MessageWebhookCreateBodyRequest, self: UsingClient): T;
     private matchReplied;
     reply(body: ReplyInteractionBody): Promise<void>;
     deferReply(flags?: MessageFlags): Promise<void>;
@@ -43,7 +43,7 @@ export declare class AutocompleteInteraction<FromGuild extends boolean = boolean
     type: InteractionType.ApplicationCommandAutocomplete;
     data: ObjectToLower<APIApplicationCommandAutocompleteInteraction['data']>;
     options: OptionResolver;
-    constructor(client: UsingClient, interaction: APIApplicationCommandAutocompleteInteraction, __reply?: __InternalReplyFunction | undefined);
+    constructor(client: UsingClient, interaction: APIApplicationCommandAutocompleteInteraction, resolver?: OptionResolver, __reply?: __InternalReplyFunction | undefined);
     getInput(): string;
     respond(choices: APICommandAutocompleteInteractionResponseCallbackData['choices']): Promise<void>;
     /** @intenal */

package/lib/structures/Interaction.js

@@ -48,7 +48,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
         }
         this.user = this.member?.user ?? new User_1.User(client, interaction.user);
     }
-    static transformBodyRequest(body) {
+    static transformBodyRequest(body, self) {
         switch (body.type) {
             case v10_1.InteractionResponseType.ApplicationCommandAutocompleteResult:
             case v10_1.InteractionResponseType.DeferredMessageUpdate:
@@ -61,6 +61,8 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                     type: body.type,
                     //@ts-ignore
                     data: {
+                        //@ts-ignore
+                        allowed_mentions: self.options?.allowedMentions,
                         ...(body.data ?? {}),
                         //@ts-ignore
                         components: body.data?.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
@@ -88,9 +90,10 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
                 return body;
         }
     }
-    static transformBody(body) {
+    static transformBody(body, self) {
         const poll = body.poll;
         return {
+            allowed_mentions: self.options?.allowedMentions,
             ...body,
             components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
             embeds: body?.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)) ?? undefined,
@@ -100,9 +103,11 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     async matchReplied(body) {
         if (this.__reply) {
             //@ts-expect-error
-            const { files, ...data } = body.data ?? {};
+            const { files, ...rest } = body.data ?? {};
+            //@ts-expect-error
+            const data = body.data instanceof builders_1.Modal ? body.data : rest;
             return (this.replied = this.__reply({
-                body: BaseInteraction.transformBodyRequest({ data, type: body.type }),
+                body: BaseInteraction.transformBodyRequest({ data, type: body.type }, this.client),
                 files: files ? await (0, builders_1.resolveFiles)(files) : undefined,
             }).then(() => (this.replied = true)));
         }
@@ -129,7 +134,7 @@ class BaseInteraction extends DiscordBase_1.DiscordBase {
     static from(client, gateway, __reply) {
         switch (gateway.type) {
             case v10_1.InteractionType.ApplicationCommandAutocomplete:
-                return new AutocompleteInteraction(client, gateway, __reply);
+                return new AutocompleteInteraction(client, gateway, undefined, __reply);
             // biome-ignore lint/suspicious/noFallthroughSwitchClause: bad interaction  between biome and ts-server
             case v10_1.InteractionType.ApplicationCommand:
                 switch (gateway.data.type) {
@@ -170,10 +175,12 @@ exports.BaseInteraction = BaseInteraction;
 class AutocompleteInteraction extends BaseInteraction {
     __reply;
     options;
-    constructor(client, interaction, __reply) {
+    constructor(client, interaction, resolver, __reply) {
         super(client, interaction);
         this.__reply = __reply;
-        this.options = new commands_1.OptionResolver(client, interaction.data.options, undefined, interaction.guild_id, interaction.data.resolved);
+        this.options =
+            resolver ??
+                new commands_1.OptionResolver(client, interaction.data.options, undefined, interaction.guild_id, interaction.data.resolved);
     }
     getInput() {
         return this.options.getAutocompleteValue() ?? '';

package/lib/structures/Message.d.ts

@@ -49,8 +49,8 @@ export declare class Message extends BaseMessage {
     delete(reason?: string): Promise<void>;
     crosspost(reason?: string): Promise<Message>;
 }
-export type EditMessageWebhook = Omit<MessageWebhookMethodEditParams, 'messageId'>;
-export type WriteMessageWebhook = MessageWebhookMethodWriteParams;
+export type EditMessageWebhook = Omit<MessageWebhookMethodEditParams, 'messageId'>['body'] & Pick<MessageWebhookMethodEditParams, 'query'>;
+export type WriteMessageWebhook = MessageWebhookMethodWriteParams['body'] & Pick<MessageWebhookMethodWriteParams, 'query'>;
 export declare class WebhookMessage extends BaseMessage {
     readonly webhookId: string;
     readonly webhookToken: string;

package/lib/structures/Message.js

@@ -122,10 +122,19 @@ class WebhookMessage extends BaseMessage {
         return this.api.webhooks(this.webhookId)(this.webhookToken).get({ query: this.thread?.id });
     }
     edit(body) {
-        return this.client.webhooks.editMessage(this.webhookId, this.webhookToken, { ...body, messageId: this.id });
+        const { query, ...rest } = body;
+        return this.client.webhooks.editMessage(this.webhookId, this.webhookToken, {
+            body: rest,
+            query,
+            messageId: this.id,
+        });
     }
     write(body) {
-        return this.client.webhooks.writeMessage(this.webhookId, this.webhookToken, body);
+        const { query, ...rest } = body;
+        return this.client.webhooks.writeMessage(this.webhookId, this.webhookToken, {
+            body: rest,
+            query,
+        });
     }
     delete(reason) {
         return this.client.webhooks.deleteMessage(this.webhookId, this.webhookToken, this.id, reason);

package/lib/structures/VoiceState.d.ts

@@ -1,16 +1,17 @@
-import type { GuildMember, UsingClient } from '../';
+import { GuildMember, type UsingClient } from '../';
 import type { VoiceStateResource } from '../cache/resources/voice-states';
 import type { ObjectToLower } from '../common';
+import type { GatewayVoiceState } from '../types';
 import { Base } from './extra/Base';
-export interface VoiceState extends Base, ObjectToLower<VoiceStateResource> {
+export interface VoiceState extends Base, ObjectToLower<Omit<VoiceStateResource, 'member'>> {
 }
 export declare class VoiceState extends Base {
-    private withMember?;
-    constructor(client: UsingClient, data: VoiceStateResource, withMember?: GuildMember | undefined);
+    protected withMember?: GuildMember;
+    constructor(client: UsingClient, data: GatewayVoiceState);
     isMuted(): boolean;
     member(force?: boolean): Promise<GuildMember>;
     user(force?: boolean): Promise<import("./User").User>;
-    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("discord-api-types/v10").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
+    channel(force?: boolean): Promise<import("./channels").BaseChannel<import("discord-api-types/payloads/v10/channel").ChannelType> | import("./channels").DMChannel | import("./channels").CategoryChannel | undefined>;
     setMute(mute?: boolean, reason?: string): Promise<GuildMember>;
     setDeaf(deaf?: boolean, reason?: string): Promise<GuildMember>;
     disconnect(reason?: string): Promise<GuildMember>;

package/lib/structures/VoiceState.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VoiceState = void 0;
+const __1 = require("../");
 const Base_1 = require("./extra/Base");
 class VoiceState extends Base_1.Base {
     withMember;
-    constructor(client, data, withMember) {
+    constructor(client, data) {
         super(client);
-        this.withMember = withMember;
-        this.__patchThis(data);
+        const { member, ...rest } = data;
+        this.__patchThis(rest);
+        if (member?.user && data.guild_id)
+            this.withMember = new __1.GuildMember(client, member, member.user, data.guild_id);
     }
     isMuted() {
         return this.mute || this.selfMute;

package/lib/structures/channels.d.ts

@@ -153,7 +153,7 @@ export declare class MessagesMethods extends DiscordBase {
         set: (messageId: string, reason?: string) => Promise<never>;
         delete: (messageId: string, reason?: string) => Promise<never>;
     };
-    static transformMessageBody<T>(body: MessageCreateBodyRequest | MessageUpdateBodyRequest): T;
+    static transformMessageBody<T>(body: MessageCreateBodyRequest | MessageUpdateBodyRequest, self: UsingClient): T;
 }
 export interface TextBaseGuildChannel extends ObjectToLower<Omit<APITextChannel, 'type' | 'permission_overwrites'>>, MessagesMethods {
 }

package/lib/structures/channels.js

@@ -159,9 +159,10 @@ class MessagesMethods extends DiscordBase_1.DiscordBase {
             delete: (messageId, reason) => ctx.client.channels.deletePin(messageId, ctx.channelId, reason),
         };
     }
-    static transformMessageBody(body) {
+    static transformMessageBody(body, self) {
         const poll = body.poll;
         return {
+            allowed_mentions: self.options?.allowedMentions,
             ...body,
             components: body.components?.map(x => (x instanceof builders_1.ActionRow ? x.toJSON() : x)) ?? undefined,
             embeds: body.embeds?.map(x => (x instanceof builders_1.Embed ? x.toJSON() : x)) ?? undefined,

package/lib/websocket/discord/sharder.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShardManager = void 0;
 const v10_1 = require("discord-api-types/v10");
-const node_worker_threads_1 = require("node:worker_threads");
 const common_1 = require("../../common");
 const constants_1 = require("../constants");
 const structures_1 = require("../structures");
 const timeout_1 = require("../structures/timeout");
 const shard_js_1 = require("./shard.js");
+let parentPort;
+let workerData;
 class ShardManager extends Map {
     connectQueue;
     options;
@@ -23,6 +24,12 @@ class ShardManager extends Map {
                 logLevel: common_1.LogLevels.Debug,
             });
         }
+        const worker_threads = (0, common_1.lazyLoadPackage)('node:worker_threads');
+        if (worker_threads) {
+            workerData = worker_threads.workerData;
+            if (worker_threads.parentPort)
+                parentPort = worker_threads.parentPort;
+        }
     }
     get totalShards() {
         return this.options.totalShards ?? this.options.info.shards;
@@ -148,8 +155,8 @@ class ShardManager extends Map {
         });
     }
     send(shardId, payload) {
-        if (node_worker_threads_1.workerData?.__USING_WATCHER__) {
-            return node_worker_threads_1.parentPort?.postMessage({
+        if (workerData?.__USING_WATCHER__) {
+            return parentPort?.postMessage({
                 type: 'SEND_TO_SHARD',
                 shardId,
                 payload,

package/lib/websocket/discord/shared.d.ts

@@ -100,4 +100,5 @@ export interface WorkerData {
     workerId: number;
     debug: boolean;
     workerProxy: boolean;
+    __USING_WATCHER__?: boolean;
 }

package/lib/websocket/discord/workermanager.d.ts

@@ -7,7 +7,6 @@
 /// <reference types="node" />
 import type { GatewayPresenceUpdateData, GatewaySendPayload } from 'discord-api-types/v10';
 import { type Worker as ClusterWorker } from 'node:cluster';
-import { Worker as ThreadWorker } from 'node:worker_threads';
 import { ApiHandler, Logger } from '../..';
 import { type Adapter } from '../../cache';
 import { type MakePartial } from '../../common';
@@ -16,7 +15,7 @@ import { MemberUpdateHandler } from './events/memberUpdate';
 import { PresenceUpdateHandler } from './events/presenceUpdate';
 import type { ShardOptions, WorkerData, WorkerManagerOptions } from './shared';
 import type { WorkerInfo, WorkerMessage, WorkerShardInfo } from './worker';
-export declare class WorkerManager extends Map<number, (ClusterWorker | ThreadWorker) & {
+export declare class WorkerManager extends Map<number, (ClusterWorker | import('node:worker_threads').Worker) & {
     ready?: boolean;
 }> {
     options: Required<WorkerManagerOptions>;
@@ -50,7 +49,7 @@ export declare class WorkerManager extends Map<number, (ClusterWorker | ThreadWo
     prepareSpaces(): number[][];
     postMessage(id: number, body: any): void;
     prepareWorkers(shards: number[][]): Promise<void>;
-    createWorker(workerData: WorkerData): ClusterWorker | ThreadWorker;
+    createWorker(workerData: WorkerData): ClusterWorker | import("worker_threads").Worker;
     spawn(workerId: number, shardId: number): void;
     handleWorkerMessage(message: WorkerMessage): Promise<void>;
     private generateNonce;

package/lib/websocket/discord/workermanager.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerManager = void 0;
 const node_cluster_1 = __importDefault(require("node:cluster"));
 const node_crypto_1 = require("node:crypto");
-const node_worker_threads_1 = require("node:worker_threads");
 const __1 = require("../..");
 const cache_1 = require("../../cache");
 const base_1 = require("../../client/base");
@@ -139,6 +138,9 @@ class WorkerManager extends Map {
         }
     }
     createWorker(workerData) {
+        const worker_threads = (0, common_1.lazyLoadPackage)('node:worker_threads');
+        if (!worker_threads)
+            throw new Error('Cannot create worker without worker_threads.');
         const env = {
             SEYFERT_SPAWNING: 'true',
         };
@@ -147,7 +149,7 @@ class WorkerManager extends Map {
         }
         switch (this.options.mode) {
             case 'threads': {
-                const worker = new node_worker_threads_1.Worker(workerData.path, {
+                const worker = new worker_threads.Worker(workerData.path, {
                     env,
                 });
                 worker.on('message', data => this.handleWorkerMessage(data));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "seyfert",
-	"version": "1.3.2",
+	"version": "1.4.0",
 	"description": "The most advanced framework for discord bots",
 	"main": "./lib/index.js",
 	"module": "./lib/index.js",
@@ -21,7 +21,7 @@
 	"license": "Apache-2.0",
 	"dependencies": {
 		"chokidar": "^3.6.0",
-		"discord-api-types": "^0.37.81",
+		"discord-api-types": "^0.37.83",
 		"magic-bytes.js": "^1.10.0",
 		"ts-mixer": "^6.0.4",
 		"ws": "^8.16.0"
@@ -71,4 +71,4 @@
 			"url": "https://github.com/socram03"
 		}
 	]
-}
+}

package/lib/commands/basecontex.d.ts

@@ -1,15 +0,0 @@
-import type { ComponentCommandInteractionMap, ComponentContext } from '../components/componentcontext';
-import type { MessageCommandInteraction, UserCommandInteraction } from '../structures';
-import type { CommandContext } from './applications/chatcontext';
-import type { MenuCommandContext } from './applications/menucontext';
-import type { UsingClient } from './applications/shared';
-export declare class BaseContext {
-    readonly client: UsingClient;
-    constructor(client: UsingClient);
-    get proxy(): import("..").APIRoutes;
-    isChat(): this is CommandContext;
-    isMenu(): this is MenuCommandContext<UserCommandInteraction | MessageCommandInteraction>;
-    isMenuUser(): this is MenuCommandContext<UserCommandInteraction>;
-    isMenuMessage(): this is MenuCommandContext<MessageCommandInteraction>;
-    isComponent(): this is ComponentContext<keyof ComponentCommandInteractionMap>;
-}

package/lib/components/command.d.ts

@@ -1,24 +0,0 @@
-import type { ModalSubmitInteraction } from '../structures';
-import type { ComponentCommandInteractionMap, ComponentContext } from './componentcontext';
-export declare const InteractionCommandType: {
-    readonly COMPONENT: 0;
-    readonly MODAL: 1;
-};
-export interface ComponentCommand {
-    __filePath?: string;
-}
-export declare abstract class ComponentCommand {
-    type: 0;
-    abstract componentType: keyof ComponentCommandInteractionMap;
-    abstract filter(interaction: ComponentContext<typeof this.componentType>): Promise<boolean> | boolean;
-    abstract run(interaction: ComponentContext<typeof this.componentType>): any;
-    get cType(): number;
-}
-export interface ModalCommand {
-    __filePath?: string;
-}
-export declare abstract class ModalCommand {
-    type: 1;
-    abstract filter(interaction: ModalSubmitInteraction): Promise<boolean> | boolean;
-    abstract run(interaction: ModalSubmitInteraction): any;
-}