oceanic.js 1.7.1-dev.e8621ff → 1.7.2-dev.02fa4da

package/dist/lib/types/channels.d.ts

@@ -26,16 +26,17 @@ import type {
     NotImplementedChannelTypes,
     GuildChannelTypes,
     ThreadChannelTypes,
-    GuildChannelTypesWithoutThreads,
+    GuildChannelsWithoutThreadsTypes,
     EditableChannelTypes,
     TextableChannelTypes,
     TextableGuildChannelTypes,
-    TextableChannelTypesWithoutThreads,
-    TextableGuildChannelTypesWithoutThreads,
+    TextableChannelsWithoutThreadsTypes,
+    TextableGuildChannelsWithoutThreadsTypes,
     VoiceChannelTypes,
     InteractionChannelTypes,
     InviteChannelTypes,
-    ImplementedChannelTypes
+    ImplementedChannelTypes,
+    ThreadOnlyChannelTypes
 } from "../Constants";
 import type Member from "../structures/Member";
 import type AnnouncementChannel from "../structures/AnnouncementChannel";
@@ -83,7 +84,6 @@ export interface RawChannel {
     rate_limit_per_user?: number;
     recipients?: Array<RawUser>;
     rtc_region?: string | null;
-    template?: string;
     thread_metadata?: RawThreadMetadata;
     topic?: string | null;
     total_message_sent?: number;
@@ -104,7 +104,9 @@ export type RawThreadChannel = RawAnnouncementThreadChannel | RawPublicThreadCha
 export interface RawAnnouncementThreadChannel extends Required<Pick<RawChannel, "id" | "guild_id" | "parent_id" | "owner_id" | "last_message_id" | "thread_metadata" | "message_count" | "member_count" | "rate_limit_per_user" | "flags" | "total_message_sent" | "newly_created" | "member">> { name: string; type: ChannelTypes.ANNOUNCEMENT_THREAD; }
 export interface RawPublicThreadChannel extends Omit<RawAnnouncementThreadChannel, "type">, Required<Pick<RawChannel, "applied_tags">> { type: ChannelTypes.PUBLIC_THREAD; }
 export interface RawPrivateThreadChannel extends Omit<RawAnnouncementThreadChannel, "type" | "member"> { member: RawChannel["member"]; type: ChannelTypes.PRIVATE_THREAD; }
-export interface RawForumChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel, "position" | "topic" | "flags" | "permission_overwrites" | "rate_limit_per_user" | "nsfw" | "available_tags" | "template" | "default_reaction_emoji" | "last_message_id" | "default_sort_order" | "default_thread_rate_limit_per_user" | "default_auto_archive_duration" | "default_forum_layout">> { type: ChannelTypes.GUILD_FORUM; }
+export interface RawThreadOnlyChannel extends Omit<RawGuildChannel, "type">, Required<Pick<RawChannel, "position" | "topic" | "flags" | "permission_overwrites" | "rate_limit_per_user" | "nsfw" | "available_tags" | "default_reaction_emoji" | "last_message_id" | "default_sort_order" | "default_thread_rate_limit_per_user" | "default_auto_archive_duration" | "default_forum_layout">> { type: ThreadOnlyChannels; }
+export interface RawForumChannel extends Omit<RawThreadOnlyChannel, "type"> { type: ChannelTypes.GUILD_FORUM; }
+export interface RawMediaChannel extends Omit<RawThreadOnlyChannel, "type"> { type: ChannelTypes.GUILD_MEDIA; }
 
 export interface PartialChannel extends Pick<RawChannel, "id" | "name" | "type"> {}
 export interface RawInteractionResolvedChannel extends Omit<Required<Pick<RawChannel, "id" | "type" | "permissions">>, "name">, Pick<RawChannel, "thread_metadata" | "parent_id"> { name: string | null; }
@@ -125,9 +127,9 @@ export interface Overwrite {
 
 export interface OverwriteOptions {
     /** The permissions to allow. */
-    allow?: string | bigint;
+    allow?: string | bigint | null;
     /** The permissions to deny. */
-    deny?: string | bigint;
+    deny?: string | bigint | null;
     /** The ID of the user or role to apply the permissions to. */
     id: string;
     /** `0` for role, `1` for user. */
@@ -225,7 +227,7 @@ export interface EditGuildChannelOptions {
     /** [Announcement, Forum, Text, Voice] The id of the parent category channel. */
     parentID?: string | null;
     /** Channel or category specific permissions. */
-    permissionOverwrites?: Array<RawOverwrite> | null;
+    permissionOverwrites?: Array<OverwriteOptions> | null;
     /** The position of the channel in the channel list. */
     position?: number | null;
     /** [Forum, Text, Thread] The seconds between sending messages for users. Between 0 and 21600. */
@@ -253,23 +255,26 @@ export interface EditStageChannelOptions extends EditAnyGuildChannelOptions, Pic
 export interface EditThreadChannelOptions extends EditPublicThreadChannelOptions, EditPrivateThreadChannelOptions {}
 export interface EditPublicThreadChannelOptions extends Pick<EditGuildChannelOptions, "name" | "archived" | "autoArchiveDuration" | "locked" | "rateLimitPerUser" | "flags" | "appliedTags"> {}
 export interface EditPrivateThreadChannelOptions extends EditPublicThreadChannelOptions, Pick<EditGuildChannelOptions, "invitable"> {}
-export interface EditForumChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultSortOrder" |"defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "topic"> {}
+export interface EditForumChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultSortOrder" |"defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "topic" | "defaultForumLayout"> {}
+export interface EditMediaChannelOptions extends EditAnyGuildChannelOptions, Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultSortOrder" |"defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "topic"> {}
 
+/* eslint-disable @typescript-eslint/member-ordering */
 export interface EditChannelOptionsMap {
-    [ChannelTypes.ANNOUNCEMENT_THREAD]: EditPublicThreadChannelOptions;
+    [ChannelTypes.GUILD_TEXT]: EditTextChannelOptions;
     [ChannelTypes.DM]: never;
+    [ChannelTypes.GUILD_VOICE]: EditVoiceChannelOptions;
     [ChannelTypes.GROUP_DM]: EditGroupDMOptions;
-    [ChannelTypes.GUILD_ANNOUNCEMENT]: EditAnnouncementChannelOptions;
     [ChannelTypes.GUILD_CATEGORY]: EditAnyGuildChannelOptions;
+    [ChannelTypes.GUILD_ANNOUNCEMENT]: EditAnnouncementChannelOptions;
+    [ChannelTypes.ANNOUNCEMENT_THREAD]: EditPublicThreadChannelOptions;
+    [ChannelTypes.PUBLIC_THREAD]: EditPublicThreadChannelOptions;
+    [ChannelTypes.PRIVATE_THREAD]: EditPrivateThreadChannelOptions;
+    [ChannelTypes.GUILD_STAGE_VOICE]: EditStageChannelOptions;
     [ChannelTypes.GUILD_DIRECTORY]: never;
     [ChannelTypes.GUILD_FORUM]: EditForumChannelOptions;
-    [ChannelTypes.GUILD_STAGE_VOICE]: EditStageChannelOptions;
-    [ChannelTypes.GUILD_TEXT]: EditTextChannelOptions;
-    [ChannelTypes.GUILD_VOICE]: EditVoiceChannelOptions;
-    [ChannelTypes.PRIVATE_THREAD]: EditPrivateThreadChannelOptions;
-    [ChannelTypes.PUBLIC_THREAD]: EditPublicThreadChannelOptions;
+    [ChannelTypes.GUILD_MEDIA]: EditMediaChannelOptions;
 }
-
+/* eslint-enable @typescript-eslint/member-ordering */
 
 export interface AddGroupRecipientOptions {
     /** The access token of the user to add. */
@@ -285,11 +290,11 @@ export interface CreateMessageOptions {
     allowedMentions?: AllowedMentions;
     /** An array of [partial attachments](https://discord.com/developers/docs/resources/channel#attachment-object) related to the sent files. */
     attachments?: Array<MessageAttachment>;
-    /** An array of [components](https://discord.com/developers/docs/interactions/message-components) to send. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util~Util.rawMessageComponents | Util#rawMessageComponents}. */
+    /** An array of [components](https://discord.com/developers/docs/interactions/message-components) to send. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util.rawMessageComponents | Util#rawMessageComponents}. */
     components?: Array<MessageActionRow>;
     /** The content of the message. */
     content?: string;
-    /** An array of [embeds](https://discord.com/developers/docs/resources/channel#embed-object) to send. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util~Util.rawEmbeds | Util#rawEmbeds}. */
+    /** An array of [embeds](https://discord.com/developers/docs/resources/channel#embed-object) to send. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util.rawEmbeds | Util#rawEmbeds}. */
     embeds?: Array<EmbedOptions>;
     /** The files to send. */
     files?: Array<File>;
@@ -628,7 +633,10 @@ export interface RawAttachment {
     width?: number;
 }
 // @TODO verify what can be sent with `attachments` in message creation/deletion, this is an assumption
-export interface MessageAttachment extends Pick<RawAttachment, "id">, Partial<Pick<RawAttachment, "description" | "filename">> {}
+export interface MessageAttachment extends Partial<Pick<RawAttachment, "description" | "filename">> {
+    /** The id of the attachment to edit, or the index of `files` to reference. */
+    id?: string | number;
+}
 
 export interface RawAllowedMentions {
     parse: Array<"everyone" | "roles" | "users">;
@@ -663,6 +671,7 @@ export interface RawMessage {
     position?: number;
     reactions?: Array<RawMessageReaction>;
     referenced_message?: RawMessage | null;
+    role_subscription_data?: RawRoleSubscriptionData;
     // stickers exists, but is deprecated
     sticker_items?: Array<StickerItem>;
     thread?: RawAnnouncementThreadChannel | RawPublicThreadChannel | RawPrivateThreadChannel;
@@ -730,16 +739,17 @@ export type NotImplementedChannels = typeof NotImplementedChannelTypes[number];
 export type ImplementedChannels = typeof ImplementedChannelTypes[number];
 export type GuildChannels = typeof GuildChannelTypes[number];
 export type ThreadChannels = typeof ThreadChannelTypes[number];
-export type GuildChannelsWithoutThreads = typeof GuildChannelTypesWithoutThreads[number];
+export type GuildChannelsWithoutThreads = typeof GuildChannelsWithoutThreadsTypes[number];
 export type PrivateChannels = typeof PrivateChannelTypes[number];
 export type EditableChannels = typeof EditableChannelTypes[number];
 export type TextableChannels = typeof TextableChannelTypes[number];
 export type TextableGuildChannels = typeof TextableGuildChannelTypes[number];
-export type TextableChannelsWithoutThreads = typeof TextableChannelTypesWithoutThreads[number];
-export type TextableGuildChannelsWithoutThreads = typeof TextableGuildChannelTypesWithoutThreads[number];
+export type TextableChannelsWithoutThreads = typeof TextableChannelsWithoutThreadsTypes[number];
+export type TextableGuildChannelsWithoutThreads = typeof TextableGuildChannelsWithoutThreadsTypes[number];
 export type VoiceChannels = typeof VoiceChannelTypes[number];
 export type InviteChannels = typeof InviteChannelTypes[number];
 export type InteractionChannels = typeof InteractionChannelTypes[number];
+export type ThreadOnlyChannels = typeof ThreadOnlyChannelTypes[number];
 
 
 export type AnyChannel = ChannelTypeMap[ChannelTypes];
@@ -757,6 +767,7 @@ export type AnyTextableGuildChannelWithoutThreads = ChannelTypeMap[TextableGuild
 export type AnyVoiceChannel = ChannelTypeMap[VoiceChannels];
 export type AnyInviteChannel = ChannelTypeMap[InviteChannels];
 export type AnyInteractionChannel = ChannelTypeMap[InteractionChannels];
+export type AnyThreadOnlyChannel = ChannelTypeMap[ThreadOnlyChannels];
 
 export interface PartialInviteChannel {
     icon?: string | null;
@@ -773,11 +784,11 @@ export interface UncachedInvite {
 }
 
 export interface GetChannelMessagesOptions<T extends AnyTextableChannel | Uncached = AnyTextableChannel | Uncached> {
-    /** Get messages after this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base~Base.generateID | Base#generateID}. */
+    /** Get messages after this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base.generateID | Base#generateID}. */
     after?: string;
-    /** Get messages around this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base~Base.generateID | Base#generateID}. */
+    /** Get messages around this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base.generateID | Base#generateID}. */
     around?: string;
-    /** Get messages before this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base~Base.generateID | Base#generateID}. */
+    /** Get messages before this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base.generateID | Base#generateID}. */
     before?: string;
     /** The maximum amount of messages to get. Defaults to 100. Use Infinity if you wish to get as many messages as possible. */
     limit?: number;
@@ -789,9 +800,9 @@ export interface GetChannelMessagesOptions<T extends AnyTextableChannel | Uncach
 }
 
 export interface GetChannelMessagesIteratorOptions<T extends AnyTextableChannel | Uncached = AnyTextableChannel | Uncached> {
-    /** Get messages after this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base~Base.generateID | Base#generateID}. */
+    /** Get messages after this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base.generateID | Base#generateID}. */
     after?: string;
-    /** Get messages before this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base~Base.generateID | Base#generateID}. */
+    /** Get messages before this message ID. IDs don't need to be valid, an ID can be generated for any timestamp via {@link Base.generateID | Base#generateID}. */
     before?: string;
     /** The maximum amount of messages to get. Defaults to 100. Use Infinity if you wish to get as many messages as possible. */
     limit?: number;
@@ -838,6 +849,7 @@ export interface RawInvite {
     channel_id?: string;
     code: string;
     expires_at?: string;
+    flags?: number;
     guild?: RawInviteGuild;
     guild_scheduled_event?: RawScheduledEvent;
     inviter?: RawUser;
@@ -919,12 +931,12 @@ export interface StartThreadWithoutMessageOptions extends StartThreadFromMessage
     type: ThreadChannels;
 }
 
-export interface StartThreadInForumOptions extends StartThreadFromMessageOptions {
+export interface StartThreadInThreadOnlyChannelOptions extends StartThreadFromMessageOptions {
     /** The message to start the thread with. */
-    message: ForumThreadStarterMessageOptions;
+    message: ThreadOnlyChannelThreadStarterMessageOptions;
 }
 
-export type ForumThreadStarterMessageOptions = Pick<CreateMessageOptions, "content" | "embeds" | "allowedMentions" | "components" | "stickerIDs" | "attachments" | "flags" | "files">;
+export type ThreadOnlyChannelThreadStarterMessageOptions = Pick<CreateMessageOptions, "content" | "embeds" | "allowedMentions" | "components" | "stickerIDs" | "attachments" | "flags" | "files">;
 
 export interface GetArchivedThreadsOptions {
     /** A **timestamp** to get threads before. */
@@ -1045,3 +1057,17 @@ export interface PurgeOptions<T extends AnyTextableGuildChannel | Uncached> {
 }
 
 export type ThreadParentChannel = TextChannel | AnnouncementChannel | ForumChannel;
+
+export interface RawRoleSubscriptionData {
+    is_renewal: boolean;
+    role_subscription_listing_id: string;
+    tier_name: string;
+    total_months_subscribed: number;
+}
+
+export interface RoleSubscriptionData {
+    isRenewal: boolean;
+    roleSubscriptionListingID: string;
+    tierName: string;
+    totalMonthsSubscribed: number;
+}

package/dist/lib/types/client.d.ts

@@ -119,23 +119,24 @@ export interface CollectionLimitsOptions {
      */
     autoModerationRules?: number | Record<string, number>;
     /**
-     * The maximum number of threads to cache per channel. This does not effect the threads cached at the guild level.
-     * @dictionaryKey channel id
+     * The maximum number of guild channels to cache.
+     * @dictionaryKey guild id
      * @defaultValue Infinity
      */
-    channelThreads?: number | Record<string, number>;
+    channels?: number | Record<string, number>;
     /**
-     * The maximum number of guild channels to cache.
+     * The maximum number of guild emojis to cache.
+     * @dictionaryKey guild id
      * @defaultValue Infinity
      */
-    channels?: number | Record<string, number>;
+    emojis?: number | Record<string, number>;
     /**
      * The maximum number of group channels to cache.
      * @defaultValue 10
      */
     groupChannels?: number;
     /**
-     * The maximum number of threads to cache per guild. This does not effect the threads cached on each channel.
+     * The maximum number of threads to cache per guild. Setting this too low might cause channels to have missing threads, as they all pull from the guild.
      * @dictionaryKey guild id
      * @defaultValue Infinity
      */
@@ -152,10 +153,17 @@ export interface CollectionLimitsOptions {
      * @defaultValue Infinity
      */
     integrations?: number | Record<string, number>;
+    /**
+     * The maximum number of guild invites to cache.
+     * @dictionaryKey guild id
+     * @defaultValue Infinity
+     */
+    invites?: number | Record<string, number>;
     /**
      * The maximum number of members to cache.
      *
      * Note: If you request members from the gateway, this will be increased (on the specific guild) as needed to accommodate those members.
+     * @dictionaryKey guild id
      * @defaultValue Infinity
      */
     members?: number | Record<string, number>;
@@ -188,6 +196,12 @@ export interface CollectionLimitsOptions {
      * @defaultValue Infinity
      */
     stageInstances?: number | Record<string, number>;
+    /**
+     * The maximum number of guild stickers to cache.
+     * @dictionaryKey guild id
+     * @defaultValue Infinity
+     */
+    stickers?: number | Record<string, number>;
     /**
      * The maximum number of unavailable guilds to cache.
      * @defaultValue Infinity

package/dist/lib/types/events.d.ts

@@ -21,7 +21,7 @@ import type {
     JSONAnnouncementThreadChannel,
     JSONAutoModerationRule,
     JSONCategoryChannel,
-    JSONForumChannel,
+    JSONThreadOnlyChannel,
     JSONGuild,
     JSONIntegration,
     JSONMember,
@@ -89,7 +89,7 @@ export interface ClientEvents {
     /** @event Emitted when a channel's pins are updated (message pinned, message unpinned). Requires the `GUILDS` intent for guild channels, and `DIRECT_MESSAGES` for direct messages. */
     channelPinsUpdate: [channel: AnyTextableChannel | Uncached, timestamp: Date | null];
     /** @event Emitted when a channel is updated. Requires the `GUILDS` intent. */
-    channelUpdate: [channel: TextChannel, oldChannel: JSONTextChannel | null] | [channel: VoiceChannel, oldChannel: JSONVoiceChannel | null] | [channel: CategoryChannel, oldChannel: JSONCategoryChannel | null] | [channel: AnnouncementChannel, oldChannel: JSONAnnouncementChannel | null] | [channel: StageChannel, oldChannel: JSONStageChannel | null] | [channel: ForumChannel, oldChannel: JSONForumChannel | null];
+    channelUpdate: [channel: TextChannel, oldChannel: JSONTextChannel | null] | [channel: VoiceChannel, oldChannel: JSONVoiceChannel | null] | [channel: CategoryChannel, oldChannel: JSONCategoryChannel | null] | [channel: AnnouncementChannel, oldChannel: JSONAnnouncementChannel | null] | [channel: StageChannel, oldChannel: JSONStageChannel | null] | [channel: ForumChannel, oldChannel: JSONThreadOnlyChannel | null];
     /** @event Emitted when a shard connects. */
     connect: [id: number];
     /** @event Emitted with various information for debugging. */

package/dist/lib/types/gateway.d.ts

@@ -107,7 +107,7 @@ interface GatewayOptions {
      */
     reconnectDelay?: ReconnectDelayFunction;
     /**
-     * If a check should be made before connecting, which will remove any disallowed intents. This requires making a request to {@link Miscellaneous~Miscellaneous.getApplication | `/applications/@me`}. Any removed intents will be emitted via the `warn` event.
+     * If a check should be made before connecting, which will remove any disallowed intents. This requires making a request to {@link REST/Miscellaneous.getApplication | `/applications/@me`}. Any removed intents will be emitted via the `warn` event.
      * @defaultValue false
      */
     removeDisallowedIntents?: boolean;

package/dist/lib/types/guilds.d.ts

@@ -58,7 +58,7 @@ export interface RawGuild {
     icon: string | null;
     icon_hash?: string | null;
     id: string;
-    joined_at: string;
+    joined_at: string | null;
     large: boolean;
     latest_onboarding_question_id?: string | null;
     max_members?: number;
@@ -610,9 +610,11 @@ export interface WidgetUser {
     };
     avatar: null;
     avatarURL: string;
+    /** Always "0000" */
     discriminator: string;
     id: string;
     status: "online" | "idle" | "dnd";
+    /** @deprecated Use `username` */
     tag: string;
     username: string;
 }

package/dist/lib/types/interactions.d.ts

@@ -17,6 +17,7 @@ import type {
     ApplicationCommandOptionTypes,
     ApplicationCommandTypes,
     ComponentTypes,
+    GuildFeature,
     InteractionResponseTypes,
     InteractionTypes,
     MessageComponentTypes,
@@ -36,6 +37,9 @@ import type InteractionOptionsWrapper from "../util/InteractionOptionsWrapper";
 import type TypedCollection from "../util/TypedCollection";
 import type InteractionResolvedChannel from "../structures/InteractionResolvedChannel";
 import type SelectMenuValuesWrapper from "../util/SelectMenuValuesWrapper";
+import type Interaction from "../structures/Interaction";
+import type Guild from "../structures/Guild";
+import type Permission from "../structures/Permission";
 
 export interface InteractionContent extends Pick<ExecuteWebhookOptions, "tts" | "content" | "embeds" | "allowedMentions" | "flags" | "components" | "attachments" | "files"> {}
 export interface InitialInteractionContent extends Omit<InteractionContent, "attachments" | "files"> {}
@@ -71,7 +75,7 @@ export interface ModalInteractionResponse {
 
 
 export interface ModalData {
-    /** The components of the modal. Each component needs its own row. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util~Util.rawModalComponents | Util#rawModalComponents}. */
+    /** The components of the modal. Each component needs its own row. `snake_case` keys should be converted to `camelCase`, or passed through {@link Util.rawModalComponents | Util#rawModalComponents}. */
     components: Array<ModalActionRow>;
     /** The custom ID of the modal. */
     customID: string;
@@ -84,6 +88,7 @@ export interface RawInteraction {
     application_id: string;
     channel_id?: string;
     data?: RawInteractionData;
+    guild?: InteractionGuild;
     guild_id?: string;
     guild_locale?: string;
     id: string;
@@ -136,10 +141,10 @@ export interface RawMessageComponentInteractionResolvedData {
 }
 
 export interface MessageComponentInteractionResolvedData {
-    channels: TypedCollection<string, RawInteractionResolvedChannel, InteractionResolvedChannel>;
-    members: TypedCollection<string, RawMember, Member, [guildID: string]>;
-    roles: TypedCollection<string, RawRole, Role, [guildID: string]>;
-    users: TypedCollection<string, RawUser, User>;
+    channels: TypedCollection<RawInteractionResolvedChannel, InteractionResolvedChannel>;
+    members: TypedCollection<RawMember, Member, [guildID: string]>;
+    roles: TypedCollection<RawRole, Role, [guildID: string]>;
+    users: TypedCollection<RawUser, User>;
 }
 
 export interface RawMessageComponentInteractionData {
@@ -182,12 +187,12 @@ export interface RawApplicationCommandInteractionResolvedData {
 }
 
 export interface ApplicationCommandInteractionResolvedData {
-    attachments: TypedCollection<string, RawAttachment, Attachment>;
-    channels: TypedCollection<string, RawInteractionResolvedChannel, InteractionResolvedChannel>;
-    members: TypedCollection<string, RawMember, Member, [guildID: string]>;
-    messages: TypedCollection<string, RawMessage, Message>;
-    roles: TypedCollection<string, RawRole, Role, [guildID: string]>;
-    users: TypedCollection<string, RawUser, User>;
+    attachments: TypedCollection<RawAttachment, Attachment>;
+    channels: TypedCollection<RawInteractionResolvedChannel, InteractionResolvedChannel>;
+    members: TypedCollection<RawMember, Member, [guildID: string]>;
+    messages: TypedCollection<RawMessage, Message>;
+    roles: TypedCollection<RawRole, Role, [guildID: string]>;
+    users: TypedCollection<RawUser, User>;
 }
 
 export type InteractionOptions = InteractionOptionsWithOptions | InteractionOptionsWithValue;
@@ -251,29 +256,56 @@ export interface AutocompleteChoice {
     value: string;
 }
 
-
-export type GuildAutocompleteInteraction = AutocompleteInteraction<AnyTextableGuildChannel>;
-export interface PrivateAutocompleteInteraction extends AutocompleteInteraction<AnyPrivateChannel | Uncached> {}
+type Guildify<T extends Interaction> = Omit<T, "appPermissions" | "guild" | "guildID" | "guildLocale" | "guildPartial" | "member" | "memberPermissions"> & {
+    appPermissions: Permission;
+    guild: Guild;
+    guildID: string;
+    guildLocale: string;
+    guildPartial: InteractionGuild;
+    member: Member;
+    memberPermissions: Permission;
+};
+type Privatify<T extends Interaction> = Omit<T, "appPermissions" | "guild" | "guildID" | "guildLocale" | "guildPartial" | "member" | "memberPermissions"> & {
+    appPermissions: undefined;
+    guild: undefined;
+    guildID: undefined;
+    guildLocale: undefined;
+    guildPartial: undefined;
+    member: undefined;
+    memberPermissions: undefined;
+};
+
+export interface GuildAutocompleteInteraction extends Guildify<AutocompleteInteraction<AnyTextableGuildChannel>> {}
+export interface PrivateAutocompleteInteraction extends Privatify<AutocompleteInteraction<AnyPrivateChannel | Uncached>> {}
 export type AnyAutocompleteInteraction = GuildAutocompleteInteraction | PrivateAutocompleteInteraction;
 
-export type GuildCommandInteraction = CommandInteraction<AnyTextableGuildChannel>;
-export interface PrivateCommandInteraction extends CommandInteraction<AnyPrivateChannel | Uncached> {}
+export interface GuildCommandInteraction extends Guildify<CommandInteraction<AnyTextableGuildChannel>> {}
+export interface PrivateCommandInteraction extends Privatify<CommandInteraction<AnyPrivateChannel | Uncached>> {}
 export type AnyCommandInteraction = GuildCommandInteraction | PrivateCommandInteraction;
 
-export interface GuildComponentButtonInteraction extends ComponentInteraction<ComponentTypes.BUTTON, AnyTextableGuildChannel> { data: MessageComponentButtonInteractionData; }
-export interface GuildComponentSelectMenuInteraction extends ComponentInteraction<SelectMenuTypes, AnyTextableGuildChannel> { data: MessageComponentSelectMenuInteractionData; }
+export interface GuildComponentButtonInteraction extends Guildify<ComponentInteraction<ComponentTypes.BUTTON, AnyTextableGuildChannel>> {}
+export interface GuildComponentSelectMenuInteraction extends Guildify<ComponentInteraction<SelectMenuTypes, AnyTextableGuildChannel>> {}
 export type GuildComponentInteraction = GuildComponentButtonInteraction | GuildComponentSelectMenuInteraction;
 
-export interface PrivateComponentButtonInteraction extends ComponentInteraction<ComponentTypes.BUTTON, AnyPrivateChannel | Uncached> {}
-export interface PrivateComponentSelectMenuInteraction extends ComponentInteraction<SelectMenuTypes, AnyPrivateChannel | Uncached> {}
+export interface PrivateComponentButtonInteraction extends Privatify<ComponentInteraction<ComponentTypes.BUTTON, AnyPrivateChannel | Uncached>> {}
+export interface PrivateComponentSelectMenuInteraction extends Privatify<ComponentInteraction<SelectMenuTypes, AnyPrivateChannel | Uncached>> {}
 export type PrivateComponentInteraction = PrivateComponentButtonInteraction | PrivateComponentSelectMenuInteraction;
 export type AnyComponentButtonInteraction = GuildComponentButtonInteraction | PrivateComponentButtonInteraction;
 export type AnyComponentSelectMenuInteraction = GuildComponentSelectMenuInteraction | PrivateComponentSelectMenuInteraction;
 export type AnyComponentInteraction = AnyComponentButtonInteraction | AnyComponentSelectMenuInteraction;
 
-export type GuildModalSubmitInteraction = ModalSubmitInteraction<AnyTextableGuildChannel>;
-export interface PrivateModalSubmitInteraction extends ModalSubmitInteraction<AnyPrivateChannel | Uncached> {}
+export interface GuildModalSubmitInteraction extends Guildify<ModalSubmitInteraction<AnyTextableGuildChannel>> {}
+export interface PrivateModalSubmitInteraction extends Privatify<ModalSubmitInteraction<AnyPrivateChannel | Uncached>> {}
 export type AnyModalSubmitInteraction = GuildModalSubmitInteraction | PrivateModalSubmitInteraction;
 
 export type SubCommandArray = [subcommand: string] | [subcommandGroup: string, subcommand: string];
 export type AutoCompleteFocusedOption = InteractionOptionsString | InteractionOptionsNumber | InteractionOptionsInteger;
+
+export interface InteractionGuild {
+    features: Array<GuildFeature>;
+    id: string;
+    locale: string;
+}
+
+export type AnyGuildInteraction = GuildAutocompleteInteraction | GuildCommandInteraction | GuildComponentInteraction | GuildModalSubmitInteraction;
+export type AnyPrivateInteraction = PrivateAutocompleteInteraction | PrivateCommandInteraction | PrivateComponentInteraction | PrivateModalSubmitInteraction;

package/dist/lib/types/json.d.ts

@@ -36,7 +36,8 @@ import type {
     GuildChannels,
     TextableGuildChannels,
     ThreadChannels,
-    VoiceChannels
+    VoiceChannels,
+    ThreadOnlyChannels
 } from "./channels";
 import type { ScheduledEventEntityMetadata } from "./scheduled-events";
 import type {
@@ -212,21 +213,8 @@ export interface JSONExtendedUser extends JSONUser {
     mfaEnabled: boolean;
     verified: boolean;
 }
-export interface JSONForumChannel extends JSONGuildChannel {
-    availableTags: Array<ForumTag>;
-    defaultAutoArchiveDuration: ThreadAutoArchiveDuration;
-    defaultForumLayout: ForumLayoutTypes;
-    defaultReactionEmoji: ForumEmoji | null;
-    defaultSortOrder: SortOrderTypes | null;
-    defaultThreadRateLimitPerUser: number;
-    flags: number;
-    lastThreadID: string | null;
-    permissionOverwrites: Array<JSONPermissionOverwrite>;
-    position: number;
-    rateLimitPerUser: number;
-    template: string;
-    threads: Array<string>;
-    topic: string | null;
+export interface JSONForumChannel extends JSONThreadOnlyChannel {
+    type: ChannelTypes.GUILD_FORUM;
 }
 export interface JSONGroupChannel extends JSONChannel {
     applicationID: string;
@@ -379,6 +367,9 @@ export interface JSONInviteGuild extends JSONBase {
     vanityURLCode: string | null;
     verificationLevel: VerificationLevels;
 }
+export interface JSONMediaChannel extends JSONThreadOnlyChannel {
+    type: ChannelTypes.GUILD_MEDIA;
+}
 export interface JSONMember extends JSONBase {
     avatar: string | null;
     communicationDisabledUntil: number | null;
@@ -599,6 +590,22 @@ export interface JSONThreadChannel extends JSONGuildChannel {
     totalMessageSent: number;
     type: ThreadChannels;
 }
+export interface JSONThreadOnlyChannel extends JSONGuildChannel {
+    availableTags: Array<ForumTag>;
+    defaultAutoArchiveDuration: ThreadAutoArchiveDuration;
+    defaultForumLayout: ForumLayoutTypes;
+    defaultReactionEmoji: ForumEmoji | null;
+    defaultSortOrder: SortOrderTypes | null;
+    defaultThreadRateLimitPerUser: number;
+    flags: number;
+    lastThreadID: string | null;
+    permissionOverwrites: Array<JSONPermissionOverwrite>;
+    position: number;
+    rateLimitPerUser: number;
+    threads: Array<string>;
+    topic: string | null;
+    type: ThreadOnlyChannels;
+}
 export interface JSONUnavailableGuild extends JSONBase {
     unavailable: true;
 }

package/dist/lib/types/misc.d.ts

@@ -1,9 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /** @module Types/Miscellaneous */
 
+import type Client from "../Client";
+
 export type StringMap<T extends Record<string, any>> = { [K in keyof T]: `${T[K]}` };
 export type ReverseMap<T extends Record<keyof T, keyof any>> = {
     [P in T[keyof T]]: {
         [K in keyof T]: T[K] extends P ? K : never
     }[keyof T]
 };
+export type AnyClass<T, I, E extends Array<unknown>> = new(data: T, client: Client, ...extra: E) => I;

package/dist/lib/types/request-handler.d.ts

@@ -23,6 +23,8 @@ export interface RequestOptions {
 export interface File {
     /** the contents of the file */
     contents: Buffer;
+    /** The index to use when uploading the file. You can use this to reference this specific file from `attachments`.w */
+    index?: number;
     /** the name of the file */
     name: string;
 }

package/dist/lib/util/Errors.d.ts

@@ -11,7 +11,7 @@ export declare class UncachedError extends Error {
     name: string;
     constructor(...args: [message: string] | [clazz: object, property: string, intent: IntentNames, client?: Client]);
 }
-/** An error encountered within {@link InteractionOptionsWrapper~InteractionOptionsWrapper | InteractionOptionsWrapper} & {@link SelectMenuValuesWrapper~SelectMenuValuesWrapper | SelectMenuValuesWrapper}. */
+/** An error encountered within {@link InteractionOptionsWrapper | InteractionOptionsWrapper} & {@link SelectMenuValuesWrapper | SelectMenuValuesWrapper}. */
 export declare class WrapperError extends Error {
     name: string;
     constructor(message: string);

package/dist/lib/util/Errors.js

@@ -27,7 +27,7 @@ class UncachedError extends Error {
     }
 }
 exports.UncachedError = UncachedError;
-/** An error encountered within {@link InteractionOptionsWrapper~InteractionOptionsWrapper | InteractionOptionsWrapper} & {@link SelectMenuValuesWrapper~SelectMenuValuesWrapper | SelectMenuValuesWrapper}. */
+/** An error encountered within {@link InteractionOptionsWrapper | InteractionOptionsWrapper} & {@link SelectMenuValuesWrapper | SelectMenuValuesWrapper}. */
 class WrapperError extends Error {
     name = "WrapperError";
     constructor(message) {
@@ -53,4 +53,4 @@ class GatewayError extends Error {
     }
 }
 exports.default = GatewayError;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWwvRXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxxQkFBcUI7OztBQU1yQixnR0FBZ0c7QUFDaEcsTUFBYSxhQUFjLFNBQVEsS0FBSztJQUMzQixJQUFJLEdBQUcsZUFBZSxDQUFDO0lBQ2hDLFlBQVksS0FBcUI7UUFDN0IsS0FBSyxDQUFDLHdCQUF3QixFQUFFLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDdEQsQ0FBQztDQUNKO0FBTEQsc0NBS0M7QUFFRCxzRUFBc0U7QUFDdEUsTUFBYSxhQUFjLFNBQVEsS0FBSztJQUMzQixJQUFJLEdBQUcsZUFBZSxDQUFDO0lBQ2hDLDRGQUE0RjtJQUM1RixZQUFZLEdBQUcsSUFBaUc7UUFDNUcsSUFBSSxPQUFlLENBQUM7UUFDcEIsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtZQUNuQixDQUFDLE9BQU8sQ0FBQyxHQUFHLElBQUksQ0FBQztTQUNwQjthQUFNO1lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQztZQUMvQyxPQUFPLEdBQUcsTUFBTSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLFFBQVEsK0JBQStCLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksUUFBUSx5Q0FBeUMsTUFBTSxVQUFVLENBQUM7U0FDdk47UUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBZEQsc0NBY0M7QUFFRCwrTUFBK007QUFDL00sTUFBYSxZQUFhLFNBQVEsS0FBSztJQUMxQixJQUFJLEdBQUcsY0FBYyxDQUFDO0lBQy9CLFlBQVksT0FBZTtRQUN2QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBTEQsb0NBS0M7QUFFRCxnRUFBZ0U7QUFDaEUsTUFBYSxlQUFnQixTQUFRLEtBQUs7SUFDN0IsSUFBSSxHQUFHLGlCQUFpQixDQUFDO0lBQ2xDLFlBQVksT0FBZTtRQUN2QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBTEQsMENBS0M7QUFHRCx1QkFBdUI7QUFDdkIsTUFBcUIsWUFBYSxTQUFRLEtBQUs7SUFDM0MsSUFBSSxDQUFTO0lBQ0osSUFBSSxHQUFHLGNBQWMsQ0FBQztJQUMvQixZQUFZLE9BQWUsRUFBRSxJQUFZO1FBQ3JDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQ3JCLENBQUM7Q0FDSjtBQVBELCtCQU9DIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXJyb3JzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWwvRXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxxQkFBcUI7OztBQU1yQixnR0FBZ0c7QUFDaEcsTUFBYSxhQUFjLFNBQVEsS0FBSztJQUMzQixJQUFJLEdBQUcsZUFBZSxDQUFDO0lBQ2hDLFlBQVksS0FBcUI7UUFDN0IsS0FBSyxDQUFDLHdCQUF3QixFQUFFLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDdEQsQ0FBQztDQUNKO0FBTEQsc0NBS0M7QUFFRCxzRUFBc0U7QUFDdEUsTUFBYSxhQUFjLFNBQVEsS0FBSztJQUMzQixJQUFJLEdBQUcsZUFBZSxDQUFDO0lBQ2hDLDRGQUE0RjtJQUM1RixZQUFZLEdBQUcsSUFBaUc7UUFDNUcsSUFBSSxPQUFlLENBQUM7UUFDcEIsSUFBSSxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtZQUNuQixDQUFDLE9BQU8sQ0FBQyxHQUFHLElBQUksQ0FBQztTQUNwQjthQUFNO1lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQztZQUMvQyxPQUFPLEdBQUcsTUFBTSxJQUFJLE1BQU0sQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQyxXQUFXLENBQUMsSUFBSSxJQUFJLFFBQVEsK0JBQStCLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxJQUFJLElBQUksUUFBUSx5Q0FBeUMsTUFBTSxVQUFVLENBQUM7U0FDdk47UUFFRCxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBZEQsc0NBY0M7QUFFRCw2SkFBNko7QUFDN0osTUFBYSxZQUFhLFNBQVEsS0FBSztJQUMxQixJQUFJLEdBQUcsY0FBYyxDQUFDO0lBQy9CLFlBQVksT0FBZTtRQUN2QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBTEQsb0NBS0M7QUFFRCxnRUFBZ0U7QUFDaEUsTUFBYSxlQUFnQixTQUFRLEtBQUs7SUFDN0IsSUFBSSxHQUFHLGlCQUFpQixDQUFDO0lBQ2xDLFlBQVksT0FBZTtRQUN2QixLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsQ0FBQztDQUNKO0FBTEQsMENBS0M7QUFHRCx1QkFBdUI7QUFDdkIsTUFBcUIsWUFBYSxTQUFRLEtBQUs7SUFDM0MsSUFBSSxDQUFTO0lBQ0osSUFBSSxHQUFHLGNBQWMsQ0FBQztJQUMvQixZQUFZLE9BQWUsRUFBRSxJQUFZO1FBQ3JDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNmLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO0lBQ3JCLENBQUM7Q0FDSjtBQVBELCtCQU9DIn0=

package/dist/lib/util/InteractionOptionsWrapper.d.ts

@@ -90,12 +90,12 @@ export default class InteractionOptionsWrapper {
     getMember(name: string, required?: false): Member | undefined;
     getMember(name: string, required: true): Member;
     /**
-     * Get a mentionable option value (channel, user, role).
+     * Get a mentionable option value (user, role).
      * @param name The name of the option.
      * @param required If true, an error will be thrown if the option is not present, or if the value cannot be found.
      */
-    getMentionable<T extends InteractionResolvedChannel | User | Role = InteractionResolvedChannel | User | Role>(name: string, required?: false): T | undefined;
-    getMentionable<T extends InteractionResolvedChannel | User | Role = InteractionResolvedChannel | User | Role>(name: string, required: true): T;
+    getMentionable<T extends User | Role = User | Role>(name: string, required?: false): T | undefined;
+    getMentionable<T extends User | Role = User | Role>(name: string, required: true): T;
     /**
      * Get a mentionable option.
      * @param name The name of the option.