seyfert 1.0.1 → 1.1.0

package/lib/client/onmessagecreate.js

@@ -9,11 +9,11 @@ function getCommandFromContent(commandRaw, self) {
     const groupName = commandRaw.length === 3 ? commandRaw[1] : undefined;
     const subcommandName = groupName ? commandRaw[2] : commandRaw[1];
     const parent = self.commands.values.find(x => x.name === parentName);
-    const fullCommandName = `${parentName}${groupName ? ` ${groupName} ${subcommandName}` : ` ${subcommandName ?? ''}`}`;
+    const fullCommandName = `${parentName}${groupName ? ` ${groupName} ${subcommandName}` : `${subcommandName ? ` ${subcommandName}` : ''}`}`;
     if (!(parent instanceof __1.Command))
         return { fullCommandName };
     if (groupName && !parent.groups?.[groupName])
-        return getCommandFromContent([parentName, subcommandName], self);
+        return getCommandFromContent([parentName, groupName], self);
     if (subcommandName && !parent.options?.some(x => x instanceof __1.SubCommand && x.name === subcommandName))
         return getCommandFromContent([parentName], self);
     const command = groupName || subcommandName
@@ -50,7 +50,8 @@ async function onMessageCreate(self, rawMessage, shardId) {
         return;
     if (!command.run)
         return self.logger.warn(`${fullCommandName} command does not have 'run' callback`);
-    if (command.dm && !message.guildId)
+    if ([__1.InteractionContextTypes.BOT_DM, __1.InteractionContextTypes.PRIVATE_CHANNEL].some(i => command.contexts?.includes(i)) &&
+        !message.guildId)
         return;
     if (command.guild_id && !command.guild_id?.includes(message.guildId))
         return;
@@ -64,7 +65,10 @@ async function onMessageCreate(self, rawMessage, shardId) {
     const args = (self.options?.commands?.argsParser ?? defaultArgsParser)(content, command);
     const { options, errors } = await parseOptions(self, command, rawMessage, args, resolved);
     const optionsResolver = new __1.OptionResolver(self, options, parent, message.guildId, resolved);
-    const context = new __1.CommandContext(self, message, optionsResolver, shardId);
+    const context = new __1.CommandContext(self, message, optionsResolver, shardId, command);
+    //@ts-expect-error
+    const extendContext = self.options?.context?.(message) ?? {};
+    Object.assign(context, extendContext);
     try {
         if (command.botPermissions && message.guildId) {
             const meMember = await self.cache.members?.get(self.botId, message.guildId);
@@ -128,119 +132,192 @@ async function parseOptions(self, command, message, args, resolved) {
     const options = [];
     const errors = [];
     for (const i of (command.options ?? [])) {
-        let value;
-        let indexAttachment = -1;
-        switch (i.type) {
-            case v10_1.ApplicationCommandOptionType.Attachment:
-                if (message.attachments[++indexAttachment]) {
-                    value = message.attachments[indexAttachment].id;
-                    resolved.attachments[value] = message.attachments[indexAttachment];
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.Boolean:
-                if (args[i.name]) {
-                    value = ['yes', 'y', 'true', 'treu'].includes(args[i.name].toLowerCase());
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.Channel:
-                {
-                    const rawId = message.content.match(/(?<=<#)[0-9]{17,19}(?=>)/g)?.find(x => args[i.name]?.includes(x));
-                    if (rawId) {
-                        const channel = i.required ? await self.channels.fetch(rawId) : await self.cache.channels?.get(rawId);
-                        if (channel) {
-                            if ('channel_types' in i) {
-                                if (!i.channel_types.includes(channel.type)) {
-                                    errors.push({
-                                        name: i.name,
-                                        error: `The entered channel type is not one of ${i
-                                            .channel_types.map(t => v10_1.ChannelType[t])
-                                            .join(', ')}`,
-                                    });
-                                    break;
+        try {
+            let value;
+            let indexAttachment = -1;
+            switch (i.type) {
+                case v10_1.ApplicationCommandOptionType.Attachment:
+                    if (message.attachments[++indexAttachment]) {
+                        value = message.attachments[indexAttachment].id;
+                        resolved.attachments[value] = message.attachments[indexAttachment];
+                    }
+                    break;
+                case v10_1.ApplicationCommandOptionType.Boolean:
+                    if (args[i.name]) {
+                        value = ['yes', 'y', 'true', 'treu'].includes(args[i.name].toLowerCase());
+                    }
+                    break;
+                case v10_1.ApplicationCommandOptionType.Channel:
+                    {
+                        const rawId = message.content.match(/(?<=<#)[0-9]{17,19}(?=>)/g)?.find(x => args[i.name]?.includes(x)) ||
+                            args[i.name]?.match(/[0-9]{17,19}/g)?.[0];
+                        if (rawId) {
+                            const channel = (await self.cache.channels?.get(rawId)) ?? (i.required ? await self.channels.fetch(rawId) : undefined);
+                            if (channel) {
+                                if ('channel_types' in i) {
+                                    if (!i.channel_types.includes(channel.type)) {
+                                        errors.push({
+                                            name: i.name,
+                                            error: `The entered channel type is not one of ${i
+                                                .channel_types.map(t => v10_1.ChannelType[t])
+                                                .join(', ')}`,
+                                        });
+                                        break;
+                                    }
                                 }
+                                value = rawId;
+                                resolved.channels[rawId] = channel;
                             }
-                            value = rawId;
-                            //@ts-expect-error
-                            resolved.channels[rawId] = channel;
                         }
                     }
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.Mentionable:
-                {
-                    const matches = message.content.match(/<@[0-9]{17,19}(?=>)|<@&[0-9]{17,19}(?=>)/g) ?? [];
-                    for (const match of matches) {
-                        if (match.includes('&')) {
-                            const rawId = match.slice(3);
-                            if (rawId) {
-                                const role = i.required
-                                    ? (await self.roles.list(message.guild_id)).find(x => x.id === rawId)
-                                    : await self.cache.roles?.get(rawId);
-                                if (role) {
-                                    value = rawId;
-                                    //@ts-expect-error
-                                    resolved.roles[rawId] = role;
+                    break;
+                case v10_1.ApplicationCommandOptionType.Mentionable:
+                    {
+                        const matches = message.content.match(/<@[0-9]{17,19}(?=>)|<@&[0-9]{17,19}(?=>)/g) ?? [];
+                        for (const match of matches) {
+                            if (match.includes('&')) {
+                                const rawId = match.slice(3);
+                                if (rawId) {
+                                    const role = (await self.cache.roles?.get(rawId)) ??
+                                        (i.required ? (await self.roles.list(message.guild_id)).find(x => x.id === rawId) : undefined);
+                                    if (role) {
+                                        value = rawId;
+                                        resolved.roles[rawId] = role;
+                                        break;
+                                    }
+                                }
+                            }
+                            else {
+                                const rawId = match.slice(2);
+                                const raw = message.mentions.find(x => rawId === x.id);
+                                if (raw) {
+                                    const { member, ...user } = raw;
+                                    value = raw.id;
+                                    resolved.users[raw.id] = user;
+                                    if (member)
+                                        resolved.members[raw.id] = member;
                                     break;
                                 }
                             }
                         }
-                        else {
-                            const rawId = match.slice(2);
-                            const raw = message.mentions.find(x => rawId === x.id);
+                    }
+                    break;
+                case v10_1.ApplicationCommandOptionType.Role:
+                    {
+                        const rawId = message.mention_roles.find(x => args[i.name]?.includes(x)) || args[i.name]?.match(/[0-9]{17,19}/g)?.[0];
+                        if (rawId) {
+                            const role = (await self.cache.roles?.get(rawId)) ??
+                                (i.required ? (await self.roles.list(message.guild_id)).find(x => x.id === rawId) : undefined);
+                            if (role) {
+                                value = rawId;
+                                resolved.roles[rawId] = role;
+                            }
+                        }
+                    }
+                    break;
+                case v10_1.ApplicationCommandOptionType.User:
+                    {
+                        const rawId = message.mentions.find(x => args[i.name]?.includes(x.id))?.id || args[i.name]?.match(/[0-9]{17,19}/g)?.[0];
+                        if (rawId) {
+                            const raw = message.mentions.find(x => args[i.name]?.includes(x.id)) ??
+                                (await self.cache.users?.get(rawId)) ??
+                                (i.required ? await self.users.fetch(rawId) : undefined);
                             if (raw) {
                                 value = raw.id;
-                                resolved.users[raw.id] = raw;
-                                break;
+                                if (raw instanceof __1.User) {
+                                    resolved.users[raw.id] = raw;
+                                    if (message.guild_id) {
+                                        const member = message.mentions.find(x => args[i.name]?.includes(x.id))?.member ??
+                                            (await self.cache.members?.get(rawId, message.guild_id)) ??
+                                            (i.required ? await self.members.fetch(rawId, message.guild_id) : undefined);
+                                        if (member)
+                                            resolved.members[raw.id] = member;
+                                    }
+                                }
+                                else {
+                                    const { member, ...user } = raw;
+                                    resolved.users[user.id] = user;
+                                    if (member)
+                                        resolved.members[user.id] = member;
+                                }
                             }
                         }
                     }
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.Role:
-                {
-                    const rawId = message.mention_roles.find(x => args[i.name]?.includes(x));
-                    if (rawId) {
-                        const role = i.required
-                            ? (await self.roles.list(message.guild_id)).find(x => x.id === rawId) //why, discord, why
-                            : await self.cache.roles?.get(rawId);
-                        if (role) {
-                            value = rawId;
-                            //@ts-expect-error
-                            resolved.roles[rawId] = role;
+                    break;
+                case v10_1.ApplicationCommandOptionType.String:
+                    {
+                        value = args[i.name];
+                        const option = i;
+                        if (value) {
+                            if (option.min_length) {
+                                if (value.length < option.min_length) {
+                                    value = undefined;
+                                    errors.push({
+                                        name: i.name,
+                                        error: `The entered string has less than ${option.min_length} characters. The minimum required is ${option.min_length} characters.`,
+                                    });
+                                    break;
+                                }
+                            }
+                            if (option.max_length) {
+                                if (value.length > option.max_length) {
+                                    value = undefined;
+                                    errors.push({
+                                        name: i.name,
+                                        error: `The entered string has more than ${option.max_length} characters. The maximum required is ${option.max_length} characters.`,
+                                    });
+                                    break;
+                                }
+                            }
+                            if (option.choices?.length) {
+                                if (!option.choices.some(x => x.name === value)) {
+                                    value = undefined;
+                                    errors.push({
+                                        name: i.name,
+                                        error: `The entered choice is invalid. Please choose one of the following options: ${option.choices
+                                            .map(x => x.name)
+                                            .join(', ')}.`,
+                                    });
+                                    break;
+                                }
+                                value = option.choices.find(x => x.name === value).value;
+                            }
                         }
                     }
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.User:
-                {
-                    const raw = message.mentions.find(x => args[i.name]?.includes(x.id));
-                    if (raw) {
-                        value = raw.id;
-                        resolved.users[raw.id] = raw;
-                    }
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.String:
-                {
-                    value = args[i.name];
-                    const option = i;
-                    if (value) {
-                        if (option.min_length) {
-                            if (value.length < option.min_length) {
+                    break;
+                case v10_1.ApplicationCommandOptionType.Number:
+                case v10_1.ApplicationCommandOptionType.Integer:
+                    {
+                        value = Number(args[i.name]);
+                        if (args[i.name] === undefined) {
+                            value = undefined;
+                            break;
+                        }
+                        if (Number.isNaN(value)) {
+                            value = undefined;
+                            errors.push({
+                                name: i.name,
+                                error: 'The entered choice is an invalid number.',
+                            });
+                            break;
+                        }
+                        const option = i;
+                        if (option.min_value) {
+                            if (value < option.min_value) {
                                 value = undefined;
                                 errors.push({
                                     name: i.name,
-                                    error: `The entered string has less than ${option.min_length} characters. The minimum required is ${option.min_length} characters.`,
+                                    error: `The entered number is less than ${option.min_value}. The minimum allowed is ${option.min_value}`,
                                 });
                                 break;
                             }
                         }
-                        if (option.max_length) {
-                            if (value.length > option.max_length) {
+                        if (option.max_value) {
+                            if (value > option.max_value) {
                                 value = undefined;
                                 errors.push({
                                     name: i.name,
-                                    error: `The entered string has more than ${option.max_length} characters. The maximum required is ${option.max_length} characters.`,
+                                    error: `The entered number is greater than ${option.max_value}. The maximum allowed is ${option.max_value}`,
                                 });
                                 break;
                             }
@@ -259,68 +336,27 @@ async function parseOptions(self, command, message, args, resolved) {
                             value = option.choices.find(x => x.name === value).value;
                         }
                     }
-                }
-                break;
-            case v10_1.ApplicationCommandOptionType.Number:
-            case v10_1.ApplicationCommandOptionType.Integer:
-                {
-                    value = Number(args[i.name]);
-                    if (args[i.name] === undefined) {
-                        value = undefined;
-                        break;
-                    }
-                    if (Number.isNaN(value)) {
-                        value = undefined;
-                        errors.push({
-                            name: i.name,
-                            error: 'The entered choice is an invalid number.',
-                        });
-                        break;
-                    }
-                    const option = i;
-                    if (option.min_value) {
-                        if (value < option.min_value) {
-                            value = undefined;
-                            errors.push({
-                                name: i.name,
-                                error: `The entered number is less than ${option.min_value}. The minimum allowed is ${option.min_value}`,
-                            });
-                            break;
-                        }
-                    }
-                    if (option.max_value) {
-                        if (value > option.max_value) {
-                            value = undefined;
-                            errors.push({
-                                name: i.name,
-                                error: `The entered number is greater than ${option.max_value}. The maximum allowed is ${option.max_value}`,
-                            });
-                            break;
-                        }
-                    }
-                    if (option.choices?.length) {
-                        if (!option.choices.some(x => x.name === value)) {
-                            value = undefined;
-                            errors.push({
-                                name: i.name,
-                                error: `The entered choice is invalid. Please choose one of the following options: ${option.choices
-                                    .map(x => x.name)
-                                    .join(', ')}.`,
-                            });
-                            break;
-                        }
-                        value = option.choices.find(x => x.name === value).value;
-                    }
-                }
-                break;
-            default:
-                break;
+                    break;
+                default:
+                    break;
+            }
+            if (value !== undefined) {
+                options.push({
+                    name: i.name,
+                    type: i.type,
+                    value,
+                });
+            }
+            else if (i.required)
+                errors.push({
+                    error: 'Option is required but returned undefined',
+                    name: i.name,
+                });
         }
-        if (value !== undefined) {
-            options.push({
+        catch (e) {
+            errors.push({
+                error: e && typeof e === 'object' && 'message' in e ? e.message : `${e}`,
                 name: i.name,
-                type: i.type,
-                value,
             });
         }
     }

package/lib/client/workerclient.d.ts

@@ -30,6 +30,7 @@ export declare class WorkerClient<Ready extends boolean = boolean> extends BaseC
     get latency(): number;
     start(options?: Omit<DeepPartial<StartOptions>, 'httpConnection' | 'token' | 'connection'>): Promise<void>;
     loadEvents(dir?: string): Promise<void>;
+    postMessage(body: any): boolean | void;
     protected handleManagerMessages(data: ManagerMessages): Promise<any>;
     private generateNonce;
     private generateSendPromise;

package/lib/client/workerclient.js

@@ -12,7 +12,19 @@ const websocket_1 = require("../websocket");
 const base_1 = require("./base");
 const oninteractioncreate_1 = require("./oninteractioncreate");
 const onmessagecreate_1 = require("./onmessagecreate");
-const workerData = node_worker_threads_1.workerData;
+let workerData;
+try {
+    workerData = {
+        debug: process.env.SEYFERT_WORKER_DEBUG === 'true',
+        intents: Number.parseInt(process.env.SEYFERT_WORKER_INTENTS),
+        path: process.env.SEYFERT_WORKER_PATH,
+        shards: process.env.SEYFERT_WORKER_SHARDS.split(',').map(id => Number.parseInt(id)),
+        token: process.env.SEYFERT_WORKER_TOKEN,
+        workerId: Number.parseInt(process.env.SEYFERT_WORKER_WORKERID),
+        workerProxy: process.env.SEYFERT_WORKER_WORKERPROXY === 'true',
+    };
+}
+catch { }
 class WorkerClient extends base_1.BaseClient {
     __handleGuilds = new Set();
     logger = new common_1.Logger({
@@ -24,13 +36,17 @@ class WorkerClient extends base_1.BaseClient {
     shards = new Map();
     constructor(options) {
         super(options);
-        if (!node_worker_threads_1.parentPort) {
+        if (!process.env.SEYFERT_SPAWNING) {
             throw new Error('WorkerClient cannot spawn without manager');
         }
-        node_worker_threads_1.parentPort.on('message', data => this.handleManagerMessages(data));
+        this.postMessage({
+            type: 'WORKER_START',
+            workerId: workerData.workerId,
+        });
+        (node_worker_threads_1.parentPort ?? process).on('message', (data) => this.handleManagerMessages(data));
         this.setServices({
             cache: {
-                adapter: new cache_1.WorkerAdapter(node_worker_threads_1.parentPort),
+                adapter: new cache_1.WorkerAdapter(workerData),
                 disabledCache: options?.disabledCache,
             },
         });
@@ -70,6 +86,11 @@ class WorkerClient extends base_1.BaseClient {
             this.logger.info('EventHandler loaded');
         }
     }
+    postMessage(body) {
+        if (node_worker_threads_1.parentPort)
+            return node_worker_threads_1.parentPort.postMessage(body);
+        return process.send(body);
+    }
     async handleManagerMessages(data) {
         switch (data.type) {
             case 'CACHE_RESULT':
@@ -90,7 +111,7 @@ class WorkerClient extends base_1.BaseClient {
                     await shard.send(0, {
                         ...data,
                     });
-                    node_worker_threads_1.parentPort.postMessage({
+                    this.postMessage({
                         type: 'RESULT_PAYLOAD',
                         nonce: data.nonce,
                         workerId: this.workerId,
@@ -110,9 +131,9 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'SPAWN_SHARDS':
                 {
-                    const cache = this.cache;
                     const onPacket = this.onPacket.bind(this);
                     const handlePayload = this.options?.handlePayload?.bind(this);
+                    const self = this;
                     for (const id of workerData.shards) {
                         let shard = this.shards.get(id);
                         if (!shard) {
@@ -124,9 +145,9 @@ class WorkerClient extends base_1.BaseClient {
                                 debugger: this.debugger,
                                 async handlePayload(shardId, payload) {
                                     await handlePayload?.(shardId, payload);
-                                    await cache.onPacket(payload);
+                                    await self.cache.onPacket(payload);
                                     await onPacket?.(payload, shardId);
-                                    node_worker_threads_1.parentPort.postMessage({
+                                    self.postMessage({
                                         workerId: workerData.workerId,
                                         shardId,
                                         type: 'RECEIVE_PAYLOAD',
@@ -136,7 +157,7 @@ class WorkerClient extends base_1.BaseClient {
                             });
                             this.shards.set(id, shard);
                         }
-                        node_worker_threads_1.parentPort.postMessage({
+                        this.postMessage({
                             type: 'CONNECT_QUEUE',
                             shardId: id,
                             workerId: workerData.workerId,
@@ -151,7 +172,7 @@ class WorkerClient extends base_1.BaseClient {
                         this.logger.fatal('Worker trying get non-existent shard');
                         return;
                     }
-                    node_worker_threads_1.parentPort.postMessage({
+                    this.postMessage({
                         ...generateShardInfo(shard),
                         nonce: data.nonce,
                         type: 'SHARD_INFO',
@@ -161,7 +182,7 @@ class WorkerClient extends base_1.BaseClient {
                 break;
             case 'WORKER_INFO':
                 {
-                    node_worker_threads_1.parentPort.postMessage({
+                    this.postMessage({
                         shards: [...this.shards.values()].map(generateShardInfo),
                         workerId: workerData.workerId,
                         type: 'WORKER_INFO',
@@ -195,7 +216,7 @@ class WorkerClient extends base_1.BaseClient {
                     catch (e) {
                         result = e;
                     }
-                    node_worker_threads_1.parentPort.postMessage({
+                    this.postMessage({
                         type: 'EVAL_RESPONSE',
                         response: result,
                         workerId: workerData.workerId,
@@ -239,7 +260,7 @@ class WorkerClient extends base_1.BaseClient {
     }
     tellWorker(workerId, func) {
         const nonce = this.generateNonce();
-        node_worker_threads_1.parentPort.postMessage({
+        this.postMessage({
             type: 'EVAL',
             func: func.toString(),
             toWorkerId: workerId,
@@ -273,7 +294,7 @@ class WorkerClient extends base_1.BaseClient {
                             if (!this.__handleGuilds?.size ||
                                 !((workerData.intents & common_1.GatewayIntentBits.Guilds) === common_1.GatewayIntentBits.Guilds)) {
                                 if ([...this.shards.values()].every(shard => shard.data.session_id)) {
-                                    node_worker_threads_1.parentPort.postMessage({
+                                    this.postMessage({
                                         type: 'WORKER_READY',
                                         workerId: this.workerId,
                                     });
@@ -293,7 +314,7 @@ class WorkerClient extends base_1.BaseClient {
                             if (this.__handleGuilds?.has(packet.d.id)) {
                                 this.__handleGuilds.delete(packet.d.id);
                                 if (!this.__handleGuilds.size && [...this.shards.values()].every(shard => shard.data.session_id)) {
-                                    node_worker_threads_1.parentPort.postMessage({
+                                    this.postMessage({
                                         type: 'WORKER_READY',
                                         workerId: this.workerId,
                                     });

package/lib/collection.js

@@ -197,7 +197,7 @@ exports.Collection = Collection;
 class LimitedCollection {
     static default = {
         resetOnDemand: false,
-        limit: Infinity,
+        limit: Number.POSITIVE_INFINITY,
         expire: 0,
     };
     data = new Map();
@@ -233,7 +233,7 @@ class LimitedCollection {
                 this.delete(iter.next().value);
             }
         }
-        if (this.closer.expireOn === expireOn) {
+        if (this.closer?.expireOn === expireOn) {
             this.resetTimeout();
         }
     }

package/lib/commands/applications/chat.d.ts

@@ -1,11 +1,11 @@
 import type { SeyfertNumberOption, SeyfertStringOption } from '../..';
 import type { Attachment } from '../../builders';
-import type { APIApplicationCommandBasicOption, APIApplicationCommandOption, LocaleString, PermissionStrings } from '../../common';
+import type { APIApplicationCommandBasicOption, APIApplicationCommandOption, FlatObjectKeys, LocaleString, PermissionStrings } from '../../common';
 import { ApplicationCommandOptionType, ApplicationCommandType } from '../../common';
 import type { AllChannels, AutocompleteInteraction, GuildRole, InteractionGuildMember, User } from '../../structures';
-import type { Groups, RegisteredMiddlewares } from '../decorators';
+import type { Groups, IntegrationTypes, InteractionContextTypes, RegisteredMiddlewares } from '../decorators';
 import type { CommandContext } from './chatcontext';
-import type { OKFunction, OnOptionsReturnObject, StopFunction, UsingClient } from './shared';
+import type { DefaultLocale, OKFunction, OnOptionsReturnObject, StopFunction, UsingClient } from './shared';
 export interface ReturnOptionsTypes {
     1: never;
     2: never;
@@ -29,6 +29,10 @@ type Wrap<N extends ApplicationCommandOptionType> = N extends ApplicationCommand
     description: string;
     description_localizations?: APIApplicationCommandBasicOption['description_localizations'];
     name_localizations?: APIApplicationCommandBasicOption['name_localizations'];
+    locales?: {
+        name?: FlatObjectKeys<DefaultLocale>;
+        description?: FlatObjectKeys<DefaultLocale>;
+    };
 };
 export type __TypeWrapper<T extends ApplicationCommandOptionType> = Wrap<T>;
 export type __TypesWrapper = {
@@ -79,8 +83,9 @@ declare class BaseCommand {
     nsfw?: boolean;
     description: string;
     default_member_permissions?: string;
+    integration_types?: IntegrationTypes[];
+    contexts?: InteractionContextTypes[];
     botPermissions?: bigint;
-    dm?: boolean;
     name_localizations?: Partial<Record<LocaleString, string>>;
     description_localizations?: Partial<Record<LocaleString, string>>;
     options?: CommandOption[] | SubCommand[];
@@ -93,7 +98,8 @@ declare class BaseCommand {
         description_localizations: BaseCommand['description_localizations'];
         guild_id: BaseCommand['guild_id'];
         default_member_permissions: BaseCommand['default_member_permissions'];
-        dm_permission?: boolean | undefined;
+        contexts: BaseCommand['contexts'];
+        integration_types: BaseCommand['integration_types'];
     };
     reload(): Promise<void>;
     run?(context: CommandContext<any>): any;
@@ -117,7 +123,8 @@ export declare class Command extends BaseCommand {
         description_localizations: Partial<Record<"id" | "en-US" | "en-GB" | "bg" | "zh-CN" | "zh-TW" | "hr" | "cs" | "da" | "nl" | "fi" | "fr" | "de" | "el" | "hi" | "hu" | "it" | "ja" | "ko" | "lt" | "no" | "pl" | "pt-BR" | "ro" | "ru" | "es-ES" | "es-419" | "sv-SE" | "th" | "tr" | "uk" | "vi", string>> | undefined;
         guild_id: string[] | undefined;
         default_member_permissions: string | undefined;
-        dm_permission?: boolean | undefined;
+        contexts: InteractionContextTypes[] | undefined;
+        integration_types: IntegrationTypes[] | undefined;
     };
     onRunError(context: CommandContext<any>, error: unknown): any;
     onOptionsError(context: CommandContext<{}, never>, metadata: OnOptionsReturnObject): any;
@@ -139,7 +146,8 @@ export declare abstract class SubCommand extends BaseCommand {
         description_localizations: Partial<Record<"id" | "en-US" | "en-GB" | "bg" | "zh-CN" | "zh-TW" | "hr" | "cs" | "da" | "nl" | "fi" | "fr" | "de" | "el" | "hi" | "hu" | "it" | "ja" | "ko" | "lt" | "no" | "pl" | "pt-BR" | "ro" | "ru" | "es-ES" | "es-419" | "sv-SE" | "th" | "tr" | "uk" | "vi", string>> | undefined;
         guild_id: string[] | undefined;
         default_member_permissions: string | undefined;
-        dm_permission?: boolean | undefined;
+        contexts: InteractionContextTypes[] | undefined;
+        integration_types: IntegrationTypes[] | undefined;
     };
     abstract run(context: CommandContext<any>): any;
 }