seyfert 1.2.2 → 1.3.0

package/lib/commands/applications/chat.js

@@ -8,7 +8,6 @@ class BaseCommand {
     __filePath;
     __t;
     __autoload;
-    __tGroups;
     guildId;
     name;
     type; // ApplicationCommandType.ChatInput | ApplicationCommandOptionType.Subcommand
@@ -21,6 +20,8 @@ class BaseCommand {
     name_localizations;
     description_localizations;
     options;
+    ignore;
+    aliases;
     /** @internal */
     async __runOptions(ctx, resolver) {
         if (!this?.options?.length) {
@@ -127,18 +128,20 @@ class BaseCommand {
     }
     async reload() {
         delete require.cache[this.__filePath];
-        const __tempCommand = await (0, common_1.magicImport)(this.__filePath).then(x => x.default ?? x);
-        Object.setPrototypeOf(this, __tempCommand.prototype);
         for (const i of this.options ?? []) {
             if (i instanceof SubCommand && i.__filePath) {
                 await i.reload();
             }
         }
+        const __tempCommand = await (0, common_1.magicImport)(this.__filePath).then(x => x.default ?? x);
+        Object.setPrototypeOf(this, __tempCommand.prototype);
     }
 }
 class Command extends BaseCommand {
     type = v10_1.ApplicationCommandType.ChatInput;
     groups;
+    groupsAliases;
+    __tGroups;
     toJSON() {
         const options = [];
         for (const i of this.options ?? []) {
@@ -168,24 +171,6 @@ class Command extends BaseCommand {
             options,
         };
     }
-    onRunError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onRunError>`, context.author.id, error);
-    }
-    onOptionsError(context, metadata) {
-        context.client.logger.fatal(`${this.name}.<onOptionsError>`, context.author.id, metadata);
-    }
-    onMiddlewaresError(context, error) {
-        context.client.logger.fatal(`${this.name}.<onMiddlewaresError>`, context.author.id, error);
-    }
-    onBotPermissionsFail(context, permissions) {
-        context.client.logger.fatal(`${this.name}.<onBotPermissionsFail>`, context.author.id, permissions);
-    }
-    onPermissionsFail(context, permissions) {
-        context.client.logger.fatal(`${this.name}.<onPermissionsFail>`, context.author.id, permissions);
-    }
-    onInternalError(client, error) {
-        client.logger.fatal(`${this.name}.<onInternalError>`, error);
-    }
 }
 exports.Command = Command;
 class SubCommand extends BaseCommand {

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

@@ -28,7 +28,7 @@ export declare class CommandContext<T extends OptionsRecord = {}, M extends keyo
     get fullCommandName(): string;
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     deferReply(ephemeral?: boolean): Promise<void | Message>;
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message | WebhookMessage>;
     deleteResponse(): Promise<void>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     fetchResponse(): Promise<If<InferWithPrefix, WebhookMessage | Message | undefined, WebhookMessage | undefined>>;

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

@@ -23,7 +23,7 @@ export declare class MenuCommandContext<T extends MessageCommandInteraction | Us
     write<FR extends boolean = false>(body: InteractionCreateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage, void | WebhookMessage>>;
     modal(body: ModalCreateBodyRequest): Promise<void>;
     deferReply(ephemeral?: boolean): Promise<void>;
-    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<Message>;
+    editResponse(body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
     deleteResponse(): Promise<void | undefined>;
     editOrReply<FR extends boolean = false>(body: InteractionCreateBodyRequest | InteractionMessageUpdateBodyRequest, fetchReply?: FR): Promise<When<FR, WebhookMessage | Message, void | WebhookMessage | Message>>;
     fetchResponse(): Promise<WebhookMessage | undefined>;

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

@@ -39,3 +39,7 @@ export type OnOptionsReturnObject = Record<string, {
     failed: true;
     value: string;
 }>;
+export declare enum IgnoreCommand {
+    Slash = 0,
+    Message = 1
+}

package/lib/commands/applications/shared.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IgnoreCommand = void 0;
+var IgnoreCommand;
+(function (IgnoreCommand) {
+    IgnoreCommand[IgnoreCommand["Slash"] = 0] = "Slash";
+    IgnoreCommand[IgnoreCommand["Message"] = 1] = "Message";
+})(IgnoreCommand || (exports.IgnoreCommand = IgnoreCommand = {}));

package/lib/commands/decorators.d.ts

@@ -1,7 +1,7 @@
 import { ApplicationCommandType, type LocaleString } from 'discord-api-types/v10';
 import type { FlatObjectKeys, PermissionStrings } from '../common';
 import type { CommandOption, OptionsRecord, SubCommand } from './applications/chat';
-import type { DefaultLocale, MiddlewareContext } from './applications/shared';
+import type { DefaultLocale, IgnoreCommand, MiddlewareContext } from './applications/shared';
 export interface RegisteredMiddlewares {
 }
 export declare enum IntegrationTypes {
@@ -22,6 +22,8 @@ type DeclareOptions = {
     nsfw?: boolean;
     integrationTypes?: (keyof typeof IntegrationTypes)[];
     contexts?: (keyof typeof InteractionContextTypes)[];
+    ignore?: IgnoreCommand;
+    aliases?: string[];
 } | (Omit<{
     name: string;
     description: string;
@@ -59,26 +61,32 @@ export declare function GroupsT(groups: Record<string, {
     name?: FlatObjectKeys<DefaultLocale>;
     description?: FlatObjectKeys<DefaultLocale>;
     defaultDescription: string;
+    aliases?: string[];
 }>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         __tGroups: Record<string, {
             name?: undefined;
             description?: undefined;
             defaultDescription: string;
+            aliases?: string[] | undefined;
         }>;
+        groupsAliases: Record<string, string>;
     };
 } & T;
 export declare function Groups(groups: Record<string, {
     name?: [language: LocaleString, value: string][];
     description?: [language: LocaleString, value: string][];
     defaultDescription: string;
+    aliases?: string[];
 }>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         groups: Record<string, {
             name?: [language: "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", value: string][] | undefined;
             description?: [language: "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", value: string][] | undefined;
             defaultDescription: string;
+            aliases?: string[] | undefined;
         }>;
+        groupsAliases: Record<string, string>;
     };
 } & T;
 export declare function Group(groupName: string): <T extends new (...args: any[]) => {}>(target: T) => {
@@ -115,6 +123,8 @@ export declare function Declare(declare: DeclareOptions): <T extends new (...arg
         description: string;
         type: ApplicationCommandType;
         guildId?: string[] | undefined;
+        ignore?: IgnoreCommand | undefined;
+        aliases?: string[] | undefined;
     };
 } & T;
 export {};

package/lib/commands/decorators.js

@@ -29,12 +29,30 @@ exports.LocalesT = LocalesT;
 function GroupsT(groups) {
     return (target) => class extends target {
         __tGroups = groups;
+        groupsAliases = {};
+        constructor(...args) {
+            super(...args);
+            for (const i in groups) {
+                for (const j of groups[i].aliases ?? []) {
+                    this.groupsAliases[j] = i;
+                }
+            }
+        }
     };
 }
 exports.GroupsT = GroupsT;
 function Groups(groups) {
     return (target) => class extends target {
         groups = groups;
+        groupsAliases = {};
+        constructor(...args) {
+            super(...args);
+            for (const i in groups) {
+                for (const j of groups[i].aliases ?? []) {
+                    this.groupsAliases[j] = i;
+                }
+            }
+        }
     };
 }
 exports.Groups = Groups;
@@ -84,6 +102,8 @@ function Declare(declare) {
         description = '';
         type = v10_1.ApplicationCommandType.ChatInput;
         guildId;
+        ignore;
+        aliases;
         constructor(...args) {
             super(...args);
             if ('description' in declare)
@@ -92,6 +112,10 @@ function Declare(declare) {
                 this.type = declare.type;
             if ('guildId' in declare)
                 this.guildId = declare.guildId;
+            if ('ignore' in declare)
+                this.ignore = declare.ignore;
+            if ('aliases' in declare)
+                this.aliases = declare.aliases;
             // check if all properties are valid
         }
     };

package/lib/commands/handler.d.ts

@@ -1,14 +1,8 @@
 import type { Logger } from '../common';
 import { BaseHandler } from '../common';
-import { Command } from './applications/chat';
+import { Command, SubCommand } from './applications/chat';
 import { ContextMenuCommand } from './applications/menu';
 import type { UsingClient } from './applications/shared';
-export interface CommandHandlerLike {
-    values: CommandHandler['values'];
-    load: CommandHandler['load'];
-    reload: CommandHandler['reload'];
-    reloadAll: CommandHandler['reloadAll'];
-}
 export declare class CommandHandler extends BaseHandler {
     protected logger: Logger;
     protected client: UsingClient;
@@ -19,4 +13,14 @@ export declare class CommandHandler extends BaseHandler {
     reloadAll(stopIfFail?: boolean): Promise<void>;
     load(commandsDir: string, client: UsingClient): Promise<(Command | ContextMenuCommand)[]>;
     private __parseCommandLocales;
+    setHandlers({ onCommand, onSubCommand, }: {
+        onCommand?: CommandHandler['onCommand'];
+        onSubCommand?: CommandHandler['onSubCommand'];
+    }): void;
+    onCommand: (file: {
+        new (): Command | SubCommand | ContextMenuCommand;
+    }) => Command | SubCommand | ContextMenuCommand | false;
+    onSubCommand: (file: {
+        new (): SubCommand;
+    }) => SubCommand | false;
 }

package/lib/commands/handler.js

@@ -40,8 +40,9 @@ class CommandHandler extends common_1.BaseHandler {
         for (const command of result) {
             let commandInstance;
             try {
-                //@ts-expect-error abstract class
-                commandInstance = new command.file();
+                commandInstance = this.onCommand(command.file);
+                if (!commandInstance)
+                    continue;
             }
             catch (e) {
                 if (e instanceof Error && e.message === 'command.file is not a constructor') {
@@ -57,12 +58,18 @@ class CommandHandler extends common_1.BaseHandler {
             if (commandInstance instanceof menu_1.ContextMenuCommand) {
                 this.values.push(commandInstance);
                 commandInstance.__filePath = command.path;
-                await this.__callback?.(commandInstance);
                 continue;
             }
             if (!(commandInstance instanceof chat_1.Command)) {
                 continue;
             }
+            commandInstance.onAfterRun ??= client.options?.commands?.defaults?.onAfterRun;
+            commandInstance.onBotPermissionsFail ??= client.options?.commands?.defaults?.onBotPermissionsFail;
+            commandInstance.onInternalError ??= client.options?.commands?.defaults?.onInternalError;
+            commandInstance.onMiddlewaresError ??= client.options?.commands?.defaults?.onMiddlewaresError;
+            commandInstance.onOptionsError ??= client.options?.commands?.defaults?.onOptionsError;
+            commandInstance.onPermissionsFail ??= client.options?.commands?.defaults?.onPermissionsFail;
+            commandInstance.onRunError ??= client.options?.commands?.defaults?.onRunError;
             commandInstance.__filePath = command.path;
             commandInstance.options ??= [];
             if (commandInstance.__autoload) {
@@ -73,9 +80,8 @@ class CommandHandler extends common_1.BaseHandler {
                         continue;
                     }
                     try {
-                        //@ts-expect-error abstract class
-                        const subCommand = new (result.find(x => x.path === option).file)();
-                        if (subCommand instanceof chat_1.SubCommand) {
+                        const subCommand = this.onSubCommand(result.find(x => x.path === option).file);
+                        if (subCommand && subCommand instanceof chat_1.SubCommand) {
                             subCommand.__filePath = option;
                             commandInstance.options.push(subCommand);
                         }
@@ -89,17 +95,33 @@ class CommandHandler extends common_1.BaseHandler {
                 if (option instanceof chat_1.SubCommand) {
                     option.middlewares = (commandInstance.middlewares ?? []).concat(option.middlewares ?? []);
                     option.onMiddlewaresError =
-                        option.onMiddlewaresError?.bind(option) ?? commandInstance.onMiddlewaresError?.bind(commandInstance);
-                    option.onRunError = option.onRunError?.bind(option) ?? commandInstance.onRunError?.bind(commandInstance);
+                        option.onMiddlewaresError?.bind(option) ??
+                            commandInstance.onMiddlewaresError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onMiddlewaresError;
+                    option.onRunError =
+                        option.onRunError?.bind(option) ??
+                            commandInstance.onRunError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onRunError;
                     option.onOptionsError =
-                        option.onOptionsError?.bind(option) ?? commandInstance.onOptionsError?.bind(commandInstance);
+                        option.onOptionsError?.bind(option) ??
+                            commandInstance.onOptionsError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onOptionsError;
                     option.onInternalError =
-                        option.onInternalError?.bind(option) ?? commandInstance.onInternalError?.bind(commandInstance);
-                    option.onAfterRun = option.onAfterRun?.bind(option) ?? commandInstance.onAfterRun?.bind(commandInstance);
+                        option.onInternalError?.bind(option) ??
+                            commandInstance.onInternalError?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onInternalError;
+                    option.onAfterRun =
+                        option.onAfterRun?.bind(option) ??
+                            commandInstance.onAfterRun?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onAfterRun;
                     option.onBotPermissionsFail =
-                        option.onBotPermissionsFail?.bind(option) ?? commandInstance.onBotPermissionsFail?.bind(commandInstance);
+                        option.onBotPermissionsFail?.bind(option) ??
+                            commandInstance.onBotPermissionsFail?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onBotPermissionsFail;
                     option.onPermissionsFail =
-                        option.onPermissionsFail?.bind(option) ?? commandInstance.onPermissionsFail?.bind(commandInstance);
+                        option.onPermissionsFail?.bind(option) ??
+                            commandInstance.onPermissionsFail?.bind(commandInstance) ??
+                            this.client.options?.commands?.defaults?.onPermissionsFail;
                 }
             }
             this.values.push(commandInstance);
@@ -109,7 +131,6 @@ class CommandHandler extends common_1.BaseHandler {
                     this.__parseCommandLocales(i, client);
                 }
             }
-            await this.__callback?.(commandInstance);
         }
         return this.values;
     }
@@ -194,5 +215,13 @@ class CommandHandler extends common_1.BaseHandler {
             }
         }
     }
+    setHandlers({ onCommand, onSubCommand, }) {
+        if (onCommand)
+            this.onCommand = onCommand;
+        if (onSubCommand)
+            this.onSubCommand = onSubCommand;
+    }
+    onCommand = (file) => new file();
+    onSubCommand = (file) => new file();
 }
 exports.CommandHandler = CommandHandler;

package/lib/common/index.d.ts

@@ -11,7 +11,9 @@ export * from './shorters/reactions';
 export * from './shorters/roles';
 export * from './shorters/templates';
 export * from './shorters/users';
+export * from './shorters/threads';
 export * from './shorters/webhook';
+export * from './shorters/interaction';
 export * from './types/options';
 export * from './types/resolvables';
 export * from './types/util';

package/lib/common/index.js

@@ -28,7 +28,9 @@ __exportStar(require("./shorters/reactions"), exports);
 __exportStar(require("./shorters/roles"), exports);
 __exportStar(require("./shorters/templates"), exports);
 __exportStar(require("./shorters/users"), exports);
+__exportStar(require("./shorters/threads"), exports);
 __exportStar(require("./shorters/webhook"), exports);
+__exportStar(require("./shorters/interaction"), exports);
 __exportStar(require("./types/options"), exports);
 __exportStar(require("./types/resolvables"), exports);
 __exportStar(require("./types/util"), exports);

package/lib/common/it/utils.d.ts

@@ -40,7 +40,6 @@ export declare function filterSplit<Element, Predicate extends (value: Element)
  */
 export declare class BaseHandler {
     protected logger: Logger;
-    __callback?: (...args: any[]) => any;
     /**
      * Initializes a new instance of the BaseHandler class.
      * @param logger The logger instance.

package/lib/common/it/utils.js

@@ -95,7 +95,6 @@ exports.filterSplit = filterSplit;
  */
 class BaseHandler {
     logger;
-    __callback;
     /**
      * Initializes a new instance of the BaseHandler class.
      * @param logger The logger instance.

package/lib/common/shorters/channels.d.ts

@@ -1,6 +1,6 @@
-import { type RESTPatchAPIChannelJSONBody, type RESTPostAPIChannelThreadsJSONBody, type RESTPostAPIGuildForumThreadsJSONBody } from 'discord-api-types/v10';
+import { type RESTGetAPIChannelMessagesQuery, type RESTPatchAPIChannelJSONBody, type RESTPostAPIChannelThreadsJSONBody, type RESTPostAPIGuildForumThreadsJSONBody } from 'discord-api-types/v10';
 import { Message, type GuildMember, type GuildRole } from '../../structures';
-import { type AllChannels, type ThreadChannel } from '../../structures/channels';
+import { type AllChannels } from '../../structures/channels';
 import { PermissionsBitField } from '../../structures/extra/Permissions';
 import { BaseShorter } from './base';
 export declare class ChannelShorter extends BaseShorter {
@@ -55,7 +55,7 @@ export declare class ChannelShorter extends BaseShorter {
      * @param reason The reason for unpinning the message.
      * @returns A promise that resolves when the thread is succesfully created.
      */
-    thread(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<ThreadChannel>;
+    thread(channelId: string, body: RESTPostAPIChannelThreadsJSONBody | RESTPostAPIGuildForumThreadsJSONBody, reason?: string): Promise<import("../../structures").ThreadChannel>;
     memberPermissions(channelId: string, member: GuildMember, checkAdmin?: boolean): Promise<PermissionsBitField>;
     overwritesFor(channelId: string, member: GuildMember): Promise<{
         everyone: {
@@ -63,21 +63,26 @@ export declare class ChannelShorter extends BaseShorter {
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         } | undefined;
         roles: {
             type: number;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         }[];
         member: {
             type: number;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         } | undefined;
     }>;
     rolePermissions(channelId: string, role: GuildRole, checkAdmin?: boolean): Promise<PermissionsBitField>;
+    fetchMessages(channelId: string, query?: RESTGetAPIChannelMessagesQuery): Promise<Message[]>;
+    setVoiceStatus(channelId: string, status?: string | null): Promise<never>;
 }
 export type ChannelShorterOptionalParams = Partial<{
     guildId: string;

package/lib/common/shorters/channels.js

@@ -9,6 +9,7 @@ const structures_1 = require("../../structures");
 const channels_1 = __importDefault(require("../../structures/channels"));
 const Permissions_1 = require("../../structures/extra/Permissions");
 const base_1 = require("./base");
+const utils_1 = require("../it/utils");
 class ChannelShorter extends base_1.BaseShorter {
     /**
      * Fetches a channel by its ID.
@@ -34,8 +35,9 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the deleted channel.
      */
     async delete(id, optional = { guildId: '@me' }) {
-        const res = await this.client.proxy.channels(id).delete({ reason: optional.reason });
-        await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId);
+        const options = (0, utils_1.MergeOptions)({ guildId: '@me' }, optional);
+        const res = await this.client.proxy.channels(id).delete({ reason: options.reason });
+        await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId);
         return (0, channels_1.default)(res, this.client);
     }
     /**
@@ -46,10 +48,11 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A Promise that resolves to the edited channel.
      */
     async edit(id, body, optional = { guildId: '@me' }) {
-        const res = await this.client.proxy.channels(id).patch({ body, reason: optional.reason });
-        await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res);
+        const options = (0, utils_1.MergeOptions)({ guildId: '@me' }, optional);
+        const res = await this.client.proxy.channels(id).patch({ body, reason: options.reason });
+        await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res);
         if (body.permission_overwrites && 'permission_overwrites' in res)
-            await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res.permission_overwrites);
+            await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(options.guildId), res.id, options.guildId, res.permission_overwrites);
         return (0, channels_1.default)(res, this.client);
     }
     /**
@@ -62,6 +65,9 @@ class ChannelShorter extends base_1.BaseShorter {
     }
     async pins(channelId) {
         const messages = await this.client.proxy.channels(channelId).pins.get();
+        await this.client.cache.messages?.patch(messages.map(x => {
+            return [x.id, x];
+        }), channelId);
         return messages.map(message => new structures_1.Message(this.client, message));
     }
     /**
@@ -91,18 +97,15 @@ class ChannelShorter extends base_1.BaseShorter {
      * @returns A promise that resolves when the thread is succesfully created.
      */
     async thread(channelId, body, reason) {
-        return (this.client.proxy
-            .channels(channelId)
-            .threads.post({ body, reason })
-            // When testing this, discord returns the thread object, but in discord api types it does not.
-            .then(thread => (0, channels_1.default)(thread, this.client)));
+        return this.client.threads.create(channelId, body, reason);
     }
     async memberPermissions(channelId, member, checkAdmin = true) {
-        const permissions = await member.fetchPermissions();
-        if (checkAdmin && permissions.has(v10_1.PermissionFlagsBits.Administrator)) {
+        const memberPermissions = await member.fetchPermissions();
+        if (checkAdmin && memberPermissions.has(v10_1.PermissionFlagsBits.Administrator)) {
             return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
         }
         const overwrites = await this.overwritesFor(channelId, member);
+        const permissions = new Permissions_1.PermissionsBitField(memberPermissions.bits);
         permissions.remove(overwrites.everyone?.deny.bits ?? 0n);
         permissions.add(overwrites.everyone?.allow.bits ?? 0n);
         permissions.remove(overwrites.roles.length > 0 ? overwrites.roles.map(role => role.deny.bits) : 0n);
@@ -147,5 +150,17 @@ class ChannelShorter extends base_1.BaseShorter {
         permissions.add(roleOverwrites?.allow.bits ?? 0n);
         return permissions;
     }
+    async fetchMessages(channelId, query) {
+        const result = await this.client.proxy.channels(channelId).messages.get({
+            query,
+        });
+        await this.client.cache.messages?.patch(result.map(x => {
+            return [x.id, x];
+        }), channelId);
+        return result.map(message => new structures_1.Message(this.client, message));
+    }
+    setVoiceStatus(channelId, status = null) {
+        return this.client.proxy.channels(channelId)['voice-status'].put({ body: { status } });
+    }
 }
 exports.ChannelShorter = ChannelShorter;

package/lib/common/shorters/guilds.d.ts

@@ -1,6 +1,6 @@
 import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildsJSONBody } from 'discord-api-types/v10';
 import type { ObjectToLower } from '..';
-import { AnonymousGuild, Guild, GuildMember, Sticker, type CreateStickerBodyRequest } from '../../structures';
+import { AnonymousGuild, AutoModerationRule, Guild, GuildMember, Sticker, type CreateStickerBodyRequest } from '../../structures';
 import { BaseShorter } from './base';
 export declare class GuildShorter extends BaseShorter {
     /**
@@ -75,6 +75,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param body The data containing the new positions of channels.
          */
         editPositions: (guildId: string, body: RESTPatchAPIGuildChannelPositionsJSONBody) => Promise<never>;
+        addFollower: (channelId: string, webhook_channel_id: string, reason?: string) => Promise<import("discord-api-types/v10").APIFollowedChannel>;
     };
     /**
      * Provides access to auto-moderation rule-related functionality in a guild.
@@ -85,14 +86,14 @@ export declare class GuildShorter extends BaseShorter {
          * @param guildId The ID of the guild.
          * @returns A Promise that resolves to an array of auto-moderation rules.
          */
-        list: (guildId: string) => Promise<import("discord-api-types/v10").RESTGetAPIAutoModerationRulesResult>;
+        list: (guildId: string) => Promise<AutoModerationRule[]>;
         /**
          * Creates a new auto-moderation rule in the guild.
          * @param guildId The ID of the guild.
          * @param body The data for creating the auto-moderation rule.
          * @returns A Promise that resolves to the created auto-moderation rule.
          */
-        create: (guildId: string, body: RESTPostAPIAutoModerationRuleJSONBody) => Promise<import("discord-api-types/v10").APIAutoModerationRule>;
+        create: (guildId: string, body: RESTPostAPIAutoModerationRuleJSONBody) => Promise<AutoModerationRule>;
         /**
          * Deletes an auto-moderation rule from the guild.
          * @param guildId The ID of the guild.
@@ -107,7 +108,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param ruleId The ID of the rule to fetch.
          * @returns A Promise that resolves to the fetched auto-moderation rule.
          */
-        fetch: (guildId: string, ruleId: string) => Promise<import("discord-api-types/v10").APIAutoModerationRule>;
+        fetch: (guildId: string, ruleId: string) => Promise<AutoModerationRule>;
         /**
          * Edits an auto-moderation rule in the guild.
          * @param guildId The ID of the guild.
@@ -116,7 +117,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param reason The reason for editing the rule.
          * @returns A Promise that resolves to the edited auto-moderation rule.
          */
-        edit: (guildId: string, ruleId: string, body: ObjectToLower<RESTPatchAPIAutoModerationRuleJSONBody>, reason?: string) => Promise<import("discord-api-types/v10").APIAutoModerationRule>;
+        edit: (guildId: string, ruleId: string, body: ObjectToLower<RESTPatchAPIAutoModerationRuleJSONBody>, reason?: string) => Promise<AutoModerationRule>;
     };
     /**
      * Provides access to sticker-related functionality in a guild.

package/lib/common/shorters/guilds.js

@@ -154,6 +154,14 @@ class GuildShorter extends base_1.BaseShorter {
              * @param body The data containing the new positions of channels.
              */
             editPositions: (guildId, body) => this.client.proxy.guilds(guildId).channels.patch({ body }),
+            addFollower: async (channelId, webhook_channel_id, reason) => {
+                return this.client.proxy.channels(channelId).followers.post({
+                    body: {
+                        webhook_channel_id,
+                    },
+                    reason,
+                });
+            },
         };
     }
     /**
@@ -166,14 +174,18 @@ class GuildShorter extends base_1.BaseShorter {
              * @param guildId The ID of the guild.
              * @returns A Promise that resolves to an array of auto-moderation rules.
              */
-            list: (guildId) => this.client.proxy.guilds(guildId)['auto-moderation'].rules.get(),
+            list: (guildId) => this.client.proxy
+                .guilds(guildId)['auto-moderation'].rules.get()
+                .then(rules => rules.map(rule => new structures_1.AutoModerationRule(this.client, rule))),
             /**
              * Creates a new auto-moderation rule in the guild.
              * @param guildId The ID of the guild.
              * @param body The data for creating the auto-moderation rule.
              * @returns A Promise that resolves to the created auto-moderation rule.
              */
-            create: (guildId, body) => this.client.proxy.guilds(guildId)['auto-moderation'].rules.post({ body }),
+            create: (guildId, body) => this.client.proxy
+                .guilds(guildId)['auto-moderation'].rules.post({ body })
+                .then(rule => new structures_1.AutoModerationRule(this.client, rule)),
             /**
              * Deletes an auto-moderation rule from the guild.
              * @param guildId The ID of the guild.
@@ -191,7 +203,10 @@ class GuildShorter extends base_1.BaseShorter {
              * @returns A Promise that resolves to the fetched auto-moderation rule.
              */
             fetch: (guildId, ruleId) => {
-                return this.client.proxy.guilds(guildId)['auto-moderation'].rules(ruleId).get();
+                return this.client.proxy
+                    .guilds(guildId)['auto-moderation'].rules(ruleId)
+                    .get()
+                    .then(rule => new structures_1.AutoModerationRule(this.client, rule));
             },
             /**
              * Edits an auto-moderation rule in the guild.
@@ -202,7 +217,10 @@ class GuildShorter extends base_1.BaseShorter {
              * @returns A Promise that resolves to the edited auto-moderation rule.
              */
             edit: (guildId, ruleId, body, reason) => {
-                return this.client.proxy.guilds(guildId)['auto-moderation'].rules(ruleId).patch({ body, reason });
+                return this.client.proxy
+                    .guilds(guildId)['auto-moderation'].rules(ruleId)
+                    .patch({ body, reason })
+                    .then(rule => new structures_1.AutoModerationRule(this.client, rule));
             },
         };
     }

package/lib/common/shorters/interaction.d.ts

@@ -0,0 +1,13 @@
+import { WebhookMessage, type ReplyInteractionBody } from '../..';
+import type { InteractionMessageUpdateBodyRequest, MessageWebhookCreateBodyRequest } from '../types/write';
+import { BaseShorter } from './base';
+export declare class InteractionShorter extends BaseShorter {
+    reply(id: string, token: string, body: ReplyInteractionBody): Promise<never>;
+    fetchResponse(token: string, messageId: string): Promise<WebhookMessage | undefined>;
+    fetchOriginal(token: string): Promise<WebhookMessage | undefined>;
+    editMessage(token: string, messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
+    editOriginal(token: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessage>;
+    deleteResponse(interactionId: string, token: string, messageId: string): Promise<void | undefined>;
+    deleteOriginal(interactionId: string, token: string): Promise<void | undefined>;
+    followup(token: string, { files, ...body }: MessageWebhookCreateBodyRequest): Promise<WebhookMessage>;
+}