oceanic.js 0.0.7 → 0.0.11-dev.40bf3a4

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

@@ -31,11 +31,18 @@ import type StageChannel from "../structures/StageChannel";
 import type TextChannel from "../structures/TextChannel";
 import type User from "../structures/User";
 import type VoiceChannel from "../structures/VoiceChannel";
+import type ForumChannel from "../structures/ForumChannel";
 
 export interface RawChannel {
     application_id?: string;
+    available_tags?: Array<RawForumTag>;
     bitrate?: number;
     default_auto_archive_duration?: ThreadAutoArchiveDuration;
+    default_reaction_emoji?: {
+        emoji_id: string | null;
+        emoji_name: string;
+    } | null;
+    default_thread_rate_limit_per_user?: number;
     flags?: number;
     guild_id?: string;
     icon?: string | null;
@@ -56,6 +63,7 @@ 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;
@@ -66,16 +74,17 @@ export interface RawChannel {
 export type RawGuildChannel = Required<Pick<RawChannel, "id" | "guild_id" | "parent_id">> & { name: string; type: GuildChannelTypes; };
 export type RawPrivateChannel = Required<Pick<RawChannel, "id" | "last_message_id" | "recipients">> & { type: ChannelTypes.DM; };
 // managed and nicks are undocumented, creating a group dm DOES work, and they show in the client, so we're supporting them
-export type RawGroupChannel = Required<Pick<RawChannel, "id" | "recipients" | "application_id" | "icon" | "owner_id" | "nsfw" | "last_message_id">> & { managed: boolean; name: string; nicks?: Record<"id" | "nick", string>; type: ChannelTypes.GROUP_DM; };
+export type RawGroupChannel = Required<Pick<RawChannel, "id" | "recipients" | "application_id" | "icon" | "owner_id" | "nsfw" | "last_message_id">> & { managed: boolean; name: string; nicks?: Array<Record<"id" | "nick", string>>; type: ChannelTypes.GROUP_DM; };
 export type RawTextChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "default_auto_archive_duration" | "last_message_id" | "last_pin_timestamp" | "rate_limit_per_user" | "topic" | "nsfw" | "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_TEXT; };
 export type RawCategoryChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel,  "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_CATEGORY; };
 export type RawAnnouncementChannel = Omit<RawTextChannel, "type"> & { type: ChannelTypes.GUILD_ANNOUNCEMENT; };
-export type RawVoiceChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "bitrate" | "user_limit" | "video_quality_mode" | "rtc_region" | "nsfw" | "topic" | "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_VOICE; };
+export type RawVoiceChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "bitrate" | "user_limit" | "video_quality_mode" | "rtc_region" | "nsfw" | "topic" | "permission_overwrites" | "position" | "last_message_id">> & { type: ChannelTypes.GUILD_VOICE; };
 export type RawStageChannel = Omit<RawGuildChannel, "type"> & Required<Pick<RawChannel, "bitrate" | "rtc_region" | "topic" | "permission_overwrites" | "position">> & { type: ChannelTypes.GUILD_STAGE_VOICE; };
 export type RawThreadChannel = RawAnnouncementThreadChannel | RawPublicThreadChannel | RawPrivateThreadChannel;
 export type RawAnnouncementThreadChannel = 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 type RawPublicThreadChannel = Omit<RawAnnouncementThreadChannel, "type"> & { type: ChannelTypes.PUBLIC_THREAD; };
 export type RawPrivateThreadChannel = Omit<RawAnnouncementThreadChannel, "type"> & { member: RawChannel["member"]; type: ChannelTypes.PRIVATE_THREAD; };
+export type RawForumChannel = 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_thread_rate_limit_per_user" | "default_auto_archive_duration">> & { type: ChannelTypes.GUILD_FORUM; };
 
 export type PartialChannel = Pick<RawChannel, "id" | "name" | "type">;
 
@@ -143,11 +152,17 @@ export interface EditGuildChannelOptions {
     archived?: boolean;
     /** [Thread] The duration after which the thread will be archived. */
     autoArchiveDuration?: ThreadAutoArchiveDuration;
-    /** [Voice, Stage] The bitrate of the channel. Minimum 8000. */
+    /** [Forum] The {@link types/channels.ForumTag | tags} available in the channel. */
+    availableTags?: Array<ForumTag>;
+    /** [Stage, Voice] The bitrate of the channel. Minimum 8000. */
     bitrate?: number | null;
-    /** [Text, Announcement] The default auto archive duration for threads made in this channel. */
+    /** [Announcement, Text] The default auto archive duration for threads made in this channel. */
     defaultAutoArchiveDuration?: ThreadAutoArchiveDuration | null;
-    /** [Thread] The [channel flags](https://discord.com/developers/docs/resources/channel#channel-object-channel-flags) to set on the channel. */
+    /** [Forum] The default auto archive duration for threads. */
+    defaultReactionEmoji?: ForumEmoji | null;
+    /** [Forum] The default reaction emoji for threads. */
+    defaultThreadRateLimitPerUser?: number;
+    /** [Forum, Thread] The {@link Constants.ChannelFlags | Channel Flags} to set on the channel. */
     flags?: number;
     /** [Private Thread] If non-moderators can add other non-moderators to the thread. */
     invitable?: boolean;
@@ -155,23 +170,25 @@ export interface EditGuildChannelOptions {
     locked?: boolean;
     /** The name of the channel. */
     name?: string;
-    /** [Text, Voice, Announcement] If the channel is age gated. */
+    /** [Announcement, Text, Voice] If the channel is age gated. */
     nsfw?: string | null;
-    /** [Text, Voice, Announcement] The id of the parent category channel. */
+    /** [Announcement, Forum, Text, Voice] The id of the parent category channel. */
     parentID?: string | null;
     /** Channel or category specific permissions. */
     permissionOverwrites?: Array<RawOverwrite> | null;
     /** The position of the channel in the channel list. */
     position?: number | null;
-    /** [Thread, Text] The seconds between sending messages for users. Between 0 and 21600. */
+    /** [Forum, Text, Thread] The seconds between sending messages for users. Between 0 and 21600. */
     rateLimitPerUser?: number | null;
     /** The reason to be displayed in the audit log. */
     reason?: string;
-    /** [Voice, Stage] The voice region id of the channel, null for automatic. */
+    /** [Stage, Voice] The voice region id of the channel, null for automatic. */
     rtcRegion?: string | null;
-    /** [Text, Announcement] The topic of the channel. */
+    /** [Forum] Undocumented property. */
+    template?: string;
+    /** [Announcement, Forum, Text, Voice] The topic of the channel. In forum channels, this is the `Guidelines` section. */
     topic?: string | null;
-    /** [Text, Announcement] Provide the opposite type to convert the channel. */
+    /** [Announcement, Text] Provide the opposite type to convert the channel. */
     type?: ChannelTypes.GUILD_TEXT | ChannelTypes.GUILD_ANNOUNCEMENT;
     /** [Voice] The maximum amount of users in the channel. `0` is unlimited, values range 1-99. */
     userLimit?: number | null;
@@ -188,6 +205,7 @@ export type EditStageChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuil
 export type EditThreadChannelOptions = EditPublicThreadChannelOptions | EditPrivateThreadChannelOptions;
 export type EditPublicThreadChannelOptions = Pick<EditGuildChannelOptions, "name" | "archived" | "autoArchiveDuration" | "locked" | "rateLimitPerUser" | "flags">;
 export type EditPrivateThreadChannelOptions = EditPublicThreadChannelOptions & Pick<EditGuildChannelOptions, "invitable">;
+export type EditForumChannelOptions = EditAnyGuildChannelOptions & Pick<EditGuildChannelOptions, "availableTags" | "defaultReactionEmoji" | "defaultThreadRateLimitPerUser" | "flags" | "nsfw"  | "rateLimitPerUser" | "template" | "topic">;
 
 export interface AddGroupRecipientOptions {
     /** The access token of the user to add. */
@@ -207,7 +225,7 @@ export interface CreateMessageOptions {
     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. */
+    /** An array of [embeds](https://discord.com/developers/docs/resources/channel#embed-object) to send. Convert `snake_case` keys to `camelCase`. */
     embeds?: Array<EmbedOptions>;
     /** The files to send. */
     files?: Array<File>;
@@ -221,87 +239,141 @@ export interface CreateMessageOptions {
     tts?: boolean;
 }
 
-export interface EmbedOptions {
-    author?: EmbedAuthorOptions;
+export interface EmbedOptionsBase {
     color?: number;
     description?: string;
-    fields?: Array<EmbedField>;
-    footer?: EmbedFooterOptions;
-    image?: EmbedImageOptions;
-    thumbnail?: EmbedThumbnailOptions;
     timestamp?: string;
     title?: string;
     url?: string;
 }
-export interface Embed {
+
+export interface RawEmbedOptions extends EmbedOptionsBase {
+    author?: RawEmbedAuthorOptions;
+    fields?: Array<EmbedField>;
+    footer?: RawEmbedFooterOptions;
+    image?: EmbedImageOptions;
+    thumbnail?: EmbedImageOptions;
+}
+
+export interface EmbedOptions extends EmbedOptionsBase {
+    author?: EmbedAuthorOptions;
+    fields?: Array<EmbedField>;
+    footer?: EmbedFooterOptions;
+    image?: EmbedImageOptions;
+    thumbnail?: EmbedImageOptions;
+}
+
+export interface EmbedBase extends EmbedOptionsBase {
+    type?: EmbedType;
+}
+
+export interface RawEmbed extends EmbedBase {
+    author?: RawEmbedAuthor;
+    fields?: Array<EmbedField>;
+    footer?: RawEmbedFooter;
+    image?: RawEmbedImage;
+    provider?: EmbedProvider;
+    thumbnail?: RawEmbedImage;
+    video?: RawEmbedVideo;
+}
+
+export interface Embed extends EmbedBase {
     author?: EmbedAuthor;
-    color?: number;
-    description?: string;
     fields?: Array<EmbedField>;
     footer?: EmbedFooter;
     image?: EmbedImage;
     provider?: EmbedProvider;
-    thumbnail?: EmbedThumbnail;
-    timestamp?: string;
-    title?: string;
-    type?: EmbedType;
-    url?: string;
+    thumbnail?: EmbedImage;
     video?: EmbedVideo;
 }
+
 export type EmbedType = "rich" | "image" | "video" | "gifv" | "article" | "link";
 
-export interface EmbedFooterOptions {
+export interface EmbedAuthorBase {
+    name: string;
+    url?: string;
+}
+
+export interface RawEmbedAuthor extends EmbedAuthorBase {
     icon_url?: string;
-    text: string;
+    proxy_icon_url?: string;
 }
-export interface EmbedImageOptions {
-    url: string;
+
+export interface EmbedAuthorOptions extends EmbedAuthorBase {
+    iconURL?: string;
 }
 
-export interface EmbedThumbnailOptions {
-    url: string;
+export interface RawEmbedAuthorOptions extends EmbedAuthorBase {
+    icon_url?: string;
+}
+
+export interface EmbedAuthor extends EmbedAuthorOptions {
+    iconURL?: string;
+    proxyIconURL?: string;
+}
+export interface EmbedFooterBase {
+    text: string;
+}
+
+export interface EmbedFooterOptions extends EmbedFooterBase {
+    iconURL?: string;
 }
 
-export interface EmbedAuthorOptions {
+export interface RawEmbedFooterOptions extends EmbedFooterBase {
     icon_url?: string;
-    name: string;
-    url?: string;
 }
 
-export interface EmbedField {
-    inline?: boolean;
-    name: string;
-    value: string;
+export interface RawEmbedFooter extends EmbedFooterBase {
+    icon_url?: string;
+    proxy_icon_url?: string;
 }
+
 export interface EmbedFooter extends EmbedFooterOptions {
-    proxy_icon_url?: string;
+    iconURL?: string;
+    proxyIconURL?: string;
 }
-export interface EmbedImage extends EmbedImageOptions {
+
+export interface EmbedImageBase {
     height?: number;
-    proxy_url?: string;
     width?: number;
 }
 
-export interface EmbedThumbnail extends EmbedThumbnailOptions {
-    height?: number;
+export interface RawEmbedImage extends EmbedImageBase, EmbedImageOptions {
     proxy_url?: string;
-    width?: number;
 }
 
-export interface EmbedVideo {
+export interface EmbedImageOptions {
+    url: string;
+}
+
+export interface EmbedImage extends EmbedImageBase, EmbedImageOptions {
+    proxyURL?: string;
+}
+
+export interface EmbedField {
+    inline?: boolean;
+    name: string;
+    value: string;
+}
+
+export interface EmbedVideoBase {
     height?: number;
-    proxy_url?: string;
     url?: string;
     width?: number;
 }
 
+export interface RawEmbedVideo extends EmbedVideoBase {
+    proxy_url?: string;
+}
+
+export interface EmbedVideo extends EmbedVideoBase {
+    proxyURL?: string;
+}
+
 export interface EmbedProvider {
     name?: string;
     url?: string;
 }
-export interface EmbedAuthor extends EmbedAuthorOptions {
-    proxy_icon_url?: string;
-}
 
 export interface AllowedMentions {
     /** If `@everyone`/`@here` mentions should be allowed. */
@@ -466,7 +538,7 @@ export interface RawMessage {
     components?: Array<RawMessageActionRow>;
     content: string;
     edited_timestamp: string | null;
-    embeds: Array<Embed>;
+    embeds: Array<RawEmbed>;
     flags?: number;
     guild_id?: string;
     id: string;
@@ -484,7 +556,7 @@ export interface RawMessage {
     referenced_message?: RawMessage | null;
     // stickers exists, but is deprecated
     sticker_items?: Array<StickerItem>;
-    thread?: RawChannel;
+    thread?: RawAnnouncementThreadChannel | RawPublicThreadChannel | RawPrivateThreadChannel;
     timestamp: string;
     tts: boolean;
     type: MessageTypes;
@@ -547,7 +619,7 @@ export interface StickerItem {
 
 
 // @TODO directory & forum
-export type AnyChannel = TextChannel | PrivateChannel | VoiceChannel | GroupChannel | CategoryChannel | AnnouncementChannel | AnnouncementThreadChannel | PublicThreadChannel | PrivateThreadChannel | StageChannel;
+export type AnyChannel = TextChannel | PrivateChannel | VoiceChannel | GroupChannel | CategoryChannel | AnnouncementChannel | AnnouncementThreadChannel | PublicThreadChannel | PrivateThreadChannel | StageChannel | ForumChannel;
 export type AnyPrivateChannel = PrivateChannel | GroupChannel;
 export type AnyGuildChannel = Exclude<AnyChannel, AnyPrivateChannel>;
 export type AnyGuildChannelWithoutThreads = Exclude<AnyGuildChannel, AnyThreadChannel>;
@@ -757,3 +829,29 @@ export interface ThreadMetadata {
 export interface PrivateThreadmetadata extends ThreadMetadata {
     invitable: boolean;
 }
+
+export interface RawForumTag {
+    emoji_id: string | null;
+    emoji_name: string | null;
+    id: string;
+    moderated: boolean;
+    name: string;
+}
+
+export interface ForumTag {
+    /** The emoji for this tag. */
+    emoji: ForumEmoji | null;
+    /** The ID of this tag. */
+    id: string;
+    /** If this tag can only be used by moderators. */
+    moderated: boolean;
+    /** The name of this tag. */
+    name: string;
+}
+
+export interface ForumEmoji {
+    /** The ID of this emoji if custom, null otherwise. */
+    id: string | null;
+    /** The unicode codepoint of this emoji if default, null otherwise. */
+    name: string | null;
+}

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

@@ -33,7 +33,7 @@ import type {
 } from "./json";
 import type { GuildApplicationCommandPermissions } from "./application-commands";
 import type { GuildEmoji, PartialEmoji, Sticker } from "./guilds";
-import type { AnyGatewayInteraction } from "./interactions";
+import type { AnyInteractionGateway } from "./interactions";
 import type { ImageFormat } from "../Constants";
 import type Guild from "../structures/Guild";
 import type UnavailableGuild from "../structures/UnavailableGuild";
@@ -65,6 +65,8 @@ export interface ClientOptions {
     allowedMentions?: AllowedMentions;
     /** Fully qualified authorization string (e.x. Bot [TOKEN]) - you MUST prefix it yourself */
     auth?: string | null;
+    /** The maximum number of items that can be present in various collections. */
+    collectionLimits?: CollectionLimitsOptions;
     /**
      * The default image format to use.
      * @defaultValue png
@@ -80,7 +82,7 @@ export interface ClientOptions {
     /** The options for the request handler. */
     rest?: RESTOptions;
 }
-type ClientInstanceOptions = Required<Omit<ClientOptions, "rest" | "gateway">>;
+type ClientInstanceOptions = Required<Omit<ClientOptions, "rest" | "gateway" | "collectionLimits">> & { collectionLimits: Required<CollectionLimitsOptions>; };
 
 export interface RESTOptions {
     /**
@@ -125,6 +127,26 @@ export interface RESTOptions {
     userAgent?: string;
 }
 
+export interface CollectionLimitsOptions {
+    /**
+     * The maximum number of members to cache. A number to apply to all guilds individually, or a dictionary of guild IDs to member limits. Any not present will be `Infinity`.
+     *
+     * Note: If you request members from the gateway, this will be increased (on the specific guild) as meeded to accomidate those members.
+     * @defaultValue 1000
+     */
+    members?: number | Record<string, number>;
+    /**
+     * The maximum number of messages to cache.
+     * @defaultValue 100
+     */
+    messages?: number;
+    /**
+     * The maximum number of users to cache globally.
+     * @defaultValue Infinity
+     */
+    users?: number;
+}
+
 // @TODO document events
 export interface ClientEvents {
     /** @event Emitted when an application command's permissions are updated. */
@@ -206,7 +228,7 @@ export interface ClientEvents {
     /** @event Emitted when an integration is updated. Requires the `GUILD_INTEGRATIONS` intent. */
     integrationUpdate: [guild: Guild, integration: Integration, oldIntegration: JSONIntegration | null];
     /** @event Emitted when an interaction is created. */
-    interactionCreate: [interaction: AnyGatewayInteraction];
+    interactionCreate: [interaction: AnyInteractionGateway];
     /** @event Emitted when an invite is created. Requires the `GUILD_INVITES` intent. */
     inviteCreate: [guild: Guild | null, channel: InviteChannel, invite: Invite];
     /** @event Emitted when an invite is deleted. Requires the `GUILD_INVITES` intent. */

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

@@ -1,6 +1,8 @@
 import type { RawUser } from "./users";
 import type {
     AnyThreadChannel,
+    ForumEmoji,
+    ForumTag,
     OverwriteOptions,
     RawChannel,
     RawGuildChannel,
@@ -325,11 +327,19 @@ export interface EditGuildOptions {
 }
 
 export interface CreateChannelOptions<T extends GuildChannelTypesWithoutThreads = GuildChannelTypesWithoutThreads> {
-    /** [Text, Announcement] The default auto archive duration for the channel. */
+    /** [Forum] The {@link types/channels.ForumTag | tags} available in the channel. */
+    availableTags?: Array<ForumTag>;
+    /** [Stage, Voice] The bitrate of the channel. Minimum 8000. */
+    bitrate?: number | null;
+    /** [Announcement, Text] The default auto archive duration for the channel. */
     defaultAutoArchiveDuration?: ThreadAutoArchiveDuration;
+    /** [Forum] The default auto archive duration for threads. */
+    defaultReactionEmoji?: ForumEmoji | null;
+    /** [Forum] The default reaction emoji for threads. */
+    defaultThreadRateLimitPerUser?: number;
     /** The name of the channel. */
     name: string;
-    /** [Text, Voice, Announcement] If the channel is age restricted. */
+    /** [Announcement, Text, Voice] If the channel is age restricted. */
     nsfw?: boolean;
     /** The ID of the category to put this channel in. */
     parentID?: string;
@@ -337,13 +347,13 @@ export interface CreateChannelOptions<T extends GuildChannelTypesWithoutThreads
     permissionOverwrites?: Array<OverwriteOptions>;
     /** The position of the channel. */
     position?: number;
-    /** [Text] The seconds between sending messages for users. Between 0 and 21600. */
+    /** [Forum, Text] The seconds between sending messages for users. Between 0 and 21600. */
     rateLimitPerUser?: number;
     /** The reason for creating the channel. */
     reason?: string;
-    /** [Voice] The voice region for the channel. */
+    /** [Stage, Voice] The voice region for the channel. */
     rtcRegion?: string;
-    /** [Text, Voice, Announcement] The topic of the channel. */
+    /** [Announcement, Forum, Text, Voice] The topic of the channel. In forum channels, this is the `Guidelines` section. */
     topic?: string;
     /** The [type](https://discord.com/developers/docs/resources/channel#channel-object-channel-types) of channel to create. */
     type: T;

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

@@ -5,7 +5,8 @@ import type {
     RawAttachment,
     RawChannel,
     RawMessage,
-    ModalActionRow
+    ModalActionRow,
+    AnyGuildTextChannel
 } from "./channels";
 import type { InteractionMember, RawMember, RawRole } from "./guilds";
 import type { RawUser } from "./users";
@@ -29,6 +30,8 @@ import type ComponentInteraction from "../structures/ComponentInteraction";
 import type AutocompleteInteraction from "../structures/AutocompleteInteraction";
 import type ModalSubmitInteraction from "../structures/ModalSubmitInteraction";
 import type InteractionOptionsWrapper from "../util/InteractionOptionsWrapper";
+import type PrivateChannel from "../structures/PrivateChannel";
+import type Guild from "../structures/Guild";
 
 export type InteractionContent = Pick<ExecuteWebhookOptions, "tts" | "content" | "embeds" | "allowedMentions" | "flags" | "components" | "attachments" | "files">;
 
@@ -213,8 +216,8 @@ export type InteractionOptionsMentionable = InteractionOptionsStringValue<Applic
 export type InteractionOptionsNumber = InteractionOptionsNumberValue<ApplicationCommandOptionTypes.NUMBER>;
 export type InteractionOptionsAttachment = InteractionOptionsStringValue<ApplicationCommandOptionTypes.ATTACHMENT>;
 
-export type AnyInteraction = PingInteraction | AnyGatewayInteraction;
-export type AnyGatewayInteraction = CommandInteraction | ComponentInteraction | AutocompleteInteraction | ModalSubmitInteraction;
+export type AnyInteraction = PingInteraction | AnyInteractionGateway;
+export type AnyInteractionGateway = AutocompleteInteraction | CommandInteraction | ComponentInteraction | ModalSubmitInteraction;
 
 
 export interface AutocompleteChoice {
@@ -225,3 +228,24 @@ export interface AutocompleteChoice {
     /** The value of the choice. */
     value: string;
 }
+
+
+export type GuildAutocompleteInteraction = Omit<AutocompleteInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: AnyGuildTextChannel; guild: Guild; guildID: string; member: Member; };
+export type PrivateAutocompleteInteraction = Omit<AutocompleteInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: PrivateChannel | undefined; };
+export type AnyAutocompleteInteraction = GuildAutocompleteInteraction | PrivateAutocompleteInteraction;
+
+export type GuildCommandInteraction = Omit<CommandInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: AnyGuildTextChannel; guild: Guild; guildID: string; member: Member; };
+export type PrivateCommandInteraction = Omit<CommandInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: PrivateChannel | undefined; };
+export type AnyCommandInteraction = GuildCommandInteraction | PrivateCommandInteraction;
+
+export type GuildComponentButtonInteraction = Omit<ComponentInteraction, "guild" | "guildID" | "channel" | "member" | "data"> & { channel: AnyGuildTextChannel; data: MessageComponentButtonInteractionData; guild: Guild; guildID: string; member: Member; };
+export type GuildComponentSelectMenuInteraction = Omit<ComponentInteraction, "guild" | "guildID" | "channel" | "member" | "data"> & { channel: AnyGuildTextChannel; data: MessageComponentSelectMenuInteractionData; guild: Guild; guildID: string; member: Member; };
+export type GuildComponentInteraction = GuildComponentButtonInteraction | GuildComponentSelectMenuInteraction;
+export type PrivateComponentButtonInteraction = Omit<ComponentInteraction, "guild" | "guildID" | "channel" | "member" | "data"> & { channel: PrivateChannel | undefined; data: MessageComponentButtonInteractionData;  };
+export type PrivateComponentSelectMenuInteraction = Omit<ComponentInteraction, "guild" | "guildID" | "channel" | "member" | "data"> & { channel: PrivateChannel | undefined; data: MessageComponentSelectMenuInteractionData; };
+export type PrivateComponentInteraction = PrivateComponentButtonInteraction | PrivateComponentSelectMenuInteraction;
+export type AnyComponentInteraction = GuildComponentInteraction | PrivateComponentInteraction;
+
+export type GuildModalSubmitInteraction = Omit<ModalSubmitInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: AnyGuildTextChannel; guild: Guild; guildID: string; member: Member; };
+export type PrivateModalSubmitInteraction = Omit<ModalSubmitInteraction, "guild" | "guildID" | "channel" | "member"> & { channel: PrivateChannel | undefined; };
+export type AnyModalSubmitInteraction = GuildModalSubmitInteraction | PrivateModalSubmitInteraction;

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

@@ -19,7 +19,6 @@ import type {
 } from "./guilds";
 import type {
     ChannelMention,
-    Embed,
     MessageActivity,
     MessageReference,
     RawChannel,
@@ -27,7 +26,10 @@ import type {
     MessageReaction,
     ThreadMetadata,
     PrivateThreadmetadata,
-    MessageActionRow
+    ForumTag,
+    ForumEmoji,
+    MessageActionRow,
+    Embed
 } from "./channels";
 import type { ScheduledEventEntityMetadata } from "./scheduled-events";
 import type { Presence } from "./gateway";
@@ -64,6 +66,7 @@ import type {
 
 export interface JSONAnnouncementChannel extends JSONTextableChannel {
     rateLimitPerUser: 0;
+    threads: Array<string>;
     type: ChannelTypes.GUILD_ANNOUNCEMENT;
 }
 export interface JSONAnnouncementThreadChannel extends JSONThreadChannel {
@@ -127,7 +130,7 @@ export interface JSONAutocompleteInteraction extends JSONInteraction {
 }
 export interface JSONAutoModerationRule extends JSONBase {
     actions: Array<AutoModerationAction>;
-    creator: JSONUser | string;
+    creator: string;
     enabled: boolean;
     eventType: AutoModerationEventTypes;
     exemptChannels: Array<string>;
@@ -203,12 +206,26 @@ export interface JSONExtendedUser extends JSONUser {
     mfaEnabled: boolean;
     verified: boolean;
 }
+export interface JSONForumChannel extends JSONGuildChannel {
+    availableTags: Array<ForumTag>;
+    defaultAutoArchiveDuration: ThreadAutoArchiveDuration;
+    defaultReactionEmoji: ForumEmoji | null;
+    defaultThreadRateLimitPerUser: number;
+    flags: number;
+    lastThread: string | null;
+    permissionOverwrites: Array<JSONPermissionOverwrite>;
+    position: number;
+    rateLimitPerUser: number;
+    template: string;
+    threads: Array<string>;
+    topic: string | null;
+}
 export interface JSONGroupChannel extends JSONChannel {
     application: string;
     icon: string | null;
     managed: boolean;
     name: string | null;
-    nicks?: Record<"id" | "nick", string>;
+    nicks: Array<Record<"id" | "nick", string>>;
     owner: string | JSONUser;
     recipients: Array<JSONUser>;
     type: ChannelTypes.GROUP_DM;
@@ -229,7 +246,7 @@ export interface JSONGuild extends JSONBase {
     explicitContentFilter: ExplicitContentFilterLevels;
     features: Array<GuildFeature>;
     icon: string | null;
-    joinedAt: number;
+    joinedAt: number | null;
     large: boolean;
     maxMembers?: number;
     maxPresences?: number;
@@ -390,7 +407,7 @@ export interface JSONMessage extends JSONBase {
     reactions: Record<string, MessageReaction>;
     referencedMessage?: JSONMessage | null;
     stickerItems?: Array<StickerItem>;
-    thread?: JSONAnnouncementThreadChannel | JSONPublicThreadChannel;
+    thread?: JSONAnnouncementThreadChannel | JSONPublicThreadChannel | JSONPrivateThreadChannel;
     timestamp: number;
     tts: boolean;
     type: MessageTypes;
@@ -498,11 +515,11 @@ export interface JSONTextableChannel extends JSONGuildChannel {
     permissionOverwrites: Array<JSONPermissionOverwrite>;
     position: number;
     rateLimitPerUser: number;
-    threads: Array<string>;
     topic: string | null;
     type: Exclude<TextChannelTypes, PrivateChannelTypes>;
 }
 export interface JSONTextChannel extends JSONTextableChannel {
+    threads: Array<string>;
     type: ChannelTypes.GUILD_TEXT;
 }
 export interface JSONThreadChannel extends JSONGuildChannel {
@@ -545,8 +562,8 @@ export interface JSONVoiceChannel extends JSONGuildChannel {
 export interface JSONVoiceState extends JSONBase {
     channel: string | null;
     deaf: boolean;
-    guild: string;
-    member: JSONMember;
+    guild?: string;
+    member?: JSONMember;
     mute: boolean;
     requestToSpeakTimestamp: number | null;
     selfDeaf: boolean;

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

@@ -3,9 +3,9 @@ import Base from "../structures/Base";
 import { Collection as PolarCollection } from "@augu/collections";
 export declare type AnyClass<T, I, E extends Array<unknown>> = new (data: T, client: Client, ...extra: E) => I;
 export default class Collection<K extends string | number, M extends Record<string, any>, C extends Base, E extends Array<unknown> = []> extends PolarCollection<K, C> {
-    protected _baseObject: AnyClass<M, C, E>;
-    protected _client: Client;
-    constructor(baseObject: AnyClass<M, C, E>, client: Client);
+    #private;
+    limit: number;
+    constructor(baseObject: AnyClass<M, C, E>, client: Client, limit?: number);
     add<T extends C>(value: T): T;
     update(value: C | Partial<M> & {
         id?: K;