@buape/carbon 0.8.0 → 0.9.0

package/dist/src/structures/Webhook.js

@@ -0,0 +1,239 @@
+import { Routes } from "discord-api-types/v10";
+import { Base } from "../abstracts/Base.js";
+import { serializePayload } from "../utils/index.js";
+import { Message } from "./Message.js";
+import { User } from "./User.js";
+export class Webhook extends Base {
+    constructor(client, input) {
+        super(client);
+        if (typeof input === "string") {
+            const url = new URL(input);
+            if (url.protocol !== "https:")
+                throw new Error("Invalid URL");
+            const [id, token] = url.pathname.split("/").slice(2);
+            if (!id || !token)
+                throw new Error("Invalid URL");
+            this.id = id;
+            this.token = token;
+            const potentialThreadId = url.searchParams.get("thread_id");
+            this.threadId = potentialThreadId ?? undefined;
+        }
+        else {
+            if ("channel_id" in input) {
+                this.setData(input);
+            }
+            this.id = input.id;
+            this.token = input.token;
+            this.threadId = "threadId" in input ? input.threadId : undefined;
+        }
+    }
+    rawData = null;
+    setData(data) {
+        if (!data)
+            throw new Error("Cannot set data without having data... smh");
+        this.rawData = data;
+    }
+    /**
+     * The ID of the webhook
+     */
+    id;
+    /**
+     * The token of the webhook
+     */
+    token;
+    /**
+     * The thread ID this webhook is for
+     */
+    threadId;
+    /**
+     * Whether the webhook is a partial webhook (meaning it does not have all the data).
+     * If this is true, you should use {@link Webhook.fetch} to get the full data of the webhook.
+     */
+    get partial() {
+        return (this.rawData === null);
+    }
+    /**
+     * The type of the webhook
+     * @see https://discord.com/developers/docs/resources/webhook#webhook-object-webhook-types
+     */
+    get type() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.type;
+    }
+    /**
+     * The guild id this webhook is for
+     */
+    get guildId() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.guild_id;
+    }
+    /**
+     * The channel id this webhook is for
+     */
+    get channelId() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.channel_id;
+    }
+    /**
+     * The user this webhook was created by
+     * Not returned when getting a webhook with its token
+     */
+    get user() {
+        if (!this.rawData?.user)
+            return undefined;
+        return new User(this.client, this.rawData.user);
+    }
+    /**
+     * The default name of the webhook
+     */
+    get name() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.name;
+    }
+    /**
+     * The default avatar of the webhook
+     */
+    get avatar() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.avatar;
+    }
+    /**
+     * Get the URL of the webhook's avatar
+     */
+    get avatarUrl() {
+        if (!this.rawData)
+            return undefined;
+        if (!this.avatar)
+            return null;
+        return `https://cdn.discordapp.com/avatars/${this.id}/${this.avatar}.png`;
+    }
+    /**
+     * The bot/OAuth2 application that created this webhook
+     */
+    get applicationId() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.application_id;
+    }
+    /**
+     * The guild of the channel that this webhook is following
+     * Only returned for Channel Follower Webhooks
+     */
+    get sourceGuild() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.source_guild;
+    }
+    /**
+     * The channel that this webhook is following
+     * Only returned for Channel Follower Webhooks
+     */
+    get sourceChannel() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.source_channel;
+    }
+    /**
+     * The url used for executing the webhook
+     * Only returned by the webhooks OAuth2 flow
+     */
+    get url() {
+        if (!this.rawData)
+            return undefined;
+        return this.rawData.url;
+    }
+    /**
+     * Fetch this webhook's data
+     * @returns A Promise that resolves to a non-partial Webhook
+     */
+    async fetch() {
+        const newData = (await this.client.rest.get(Routes.webhook(this.id)));
+        if (!newData)
+            throw new Error(`Webhook ${this.id} not found`);
+        this.setData(newData);
+        return this;
+    }
+    /**
+     * Modify this webhook
+     * @param data The data to modify the webhook with
+     * @returns A Promise that resolves to the modified webhook
+     */
+    async modify(data) {
+        const newData = (await this.client.rest.patch(Routes.webhook(this.id), {
+            body: data
+        }));
+        this.setData(newData);
+        return this;
+    }
+    /**
+     * Delete this webhook
+     * @returns A Promise that resolves when the webhook is deleted
+     */
+    async delete() {
+        await this.client.rest.delete(Routes.webhook(this.id));
+    }
+    /**
+     * Send a message through this webhook
+     * @param data The data to send with the webhook
+     * @param threadId Optional ID of the thread to send the message to. If not provided, uses the webhook's thread ID.
+     * @returns A Promise that resolves to the created message
+     */
+    async send(data, threadId) {
+        if (!this.token)
+            throw new Error("Cannot send webhook message without token");
+        const serialized = serializePayload(data);
+        const finalThreadId = threadId || this.threadId;
+        const message = (await this.client.rest.post(Routes.webhook(this.id, this.token), {
+            body: serialized
+        }, finalThreadId ? { thread_id: finalThreadId } : undefined));
+        return new Message(this.client, message);
+    }
+    /**
+     * Edit a message sent by this webhook
+     * @param messageId The ID of the message to edit
+     * @param data The data to edit the message with
+     * @param threadId Optional ID of the thread to edit the message in. If not provided, uses the webhook's thread ID.
+     * @returns A Promise that resolves to the edited message
+     */
+    async edit(messageId, data, threadId) {
+        if (!this.token)
+            throw new Error("Cannot edit webhook message without token");
+        const serialized = serializePayload(data);
+        const finalThreadId = threadId || this.threadId;
+        const message = (await this.client.rest.patch(Routes.webhookMessage(this.id, this.token, messageId), {
+            body: serialized
+        }, finalThreadId ? { thread_id: finalThreadId } : undefined));
+        return new Message(this.client, message);
+    }
+    /**
+     * Delete a message sent by this webhook
+     * @param messageId The ID of the message to delete
+     * @param threadId Optional ID of the thread to delete the message from. If not provided, uses the webhook's thread ID.
+     * @returns A Promise that resolves when the message is deleted
+     */
+    async deleteMessage(messageId, threadId) {
+        if (!this.token)
+            throw new Error("Cannot delete webhook message without token");
+        const finalThreadId = threadId || this.threadId;
+        await this.client.rest.delete(Routes.webhookMessage(this.id, this.token, messageId), undefined, finalThreadId ? { thread_id: finalThreadId } : undefined);
+    }
+    /**
+     * Get a message sent by this webhook
+     * @param messageId The ID of the message to get
+     * @param threadId Optional ID of the thread to get the message from. If not provided, uses the webhook's thread ID.
+     * @returns A Promise that resolves to the message
+     */
+    async getMessage(messageId, threadId) {
+        if (!this.token)
+            throw new Error("Cannot get webhook message without token");
+        const finalThreadId = threadId || this.threadId;
+        const message = (await this.client.rest.get(Routes.webhookMessage(this.id, this.token, messageId), finalThreadId ? { thread_id: finalThreadId } : undefined));
+        return new Message(this.client, message);
+    }
+}
+//# sourceMappingURL=Webhook.js.map

package/dist/src/structures/Webhook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Webhook.js","sourceRoot":"","sources":["../../../src/structures/Webhook.ts"],"names":[],"mappings":"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"}

package/dist/src/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { APIAllowedMentions } from "discord-api-types/v10";
+import type { APIAllowedMentions, APIAttachment } from "discord-api-types/v10";
 import type { BaseMessageInteractiveComponent } from "../abstracts/BaseMessageInteractiveComponent.js";
 import type { Embed } from "../classes/Embed.js";
 import type { Container } from "../classes/components/Container.js";
@@ -8,13 +8,53 @@ import type { Row } from "../classes/components/Row.js";
 import type { Section } from "../classes/components/Section.js";
 import type { Separator } from "../classes/components/Separator.js";
 import type { TextDisplay } from "../classes/components/TextDisplay.js";
+export type ComponentParserResult = {
+    key: string;
+    data: Record<string, string | number | boolean>;
+};
+export type ComponentData<T extends keyof ComponentParserResult["data"] = keyof ComponentParserResult["data"]> = {
+    [K in T]: ComponentParserResult["data"][K];
+};
 export type AllowedMentions = APIAllowedMentions;
 export type TopLevelComponents = Row<BaseMessageInteractiveComponent> | Container | File | MediaGallery | Section | Separator | TextDisplay;
-/**
- * The data that is sent to Discord when sending a message.
- * If you pass just a string, it will be treated as the content of the message.
- */
-export type MessagePayload = {
+export type PollSendPayload = {
+    question: {
+        /**
+         * The text of the question, up to 300 characters
+         */
+        text?: string;
+    };
+    answers: {
+        /**
+         * The text of the answer, up to 55 characters
+         */
+        text?: string;
+        /**
+         * The emoji of the answer.
+         * When creating a poll answer with an emoji,
+         * you only need to send either the id (custom emoji) or name (default emoji) as the only field.
+         */
+        emoji?: {
+            name: string;
+            id: string;
+        };
+    }[];
+    /**
+     * The time in seconds before the poll expires.
+     */
+    expiry: number;
+    /**
+     * Whether the poll allows multiple answers
+     */
+    allowMultiselect: boolean;
+    /**
+     * The layout type of the poll.
+     * Currently only 1 is supported, and will be set by default.
+     * @default 1
+     */
+    layoutType?: 1;
+};
+export type MessagePayloadObject = {
     /**
      * The content of the message
      */
@@ -43,7 +83,16 @@ export type MessagePayload = {
      * The files to send in the message
      */
     files?: MessagePayloadFile[];
-} | string;
+    /**
+     * The poll to send in the message
+     */
+    poll?: PollSendPayload;
+};
+/**
+ * The data that is sent to Discord when sending a message.
+ * If you pass just a string, it will be treated as the content of the message.
+ */
+export type MessagePayload = string | MessagePayloadObject;
 /**
  * The data for a file to send in an interaction
  */
@@ -58,10 +107,26 @@ export type MessagePayloadFile = {
     data: Blob;
     /**
      * The alt text of the file, shown for accessibility
-     * @alpha This isn't implemented yet
      */
     description?: string;
 };
+export type VoiceState = {
+    guildId?: string;
+    channelId: string | null;
+    userId: string;
+    sessionId: string;
+    deaf: boolean;
+    mute: boolean;
+    selfDeaf: boolean;
+    selfMute: boolean;
+    selfStream: boolean;
+    selfVideo: boolean;
+    suppress: boolean;
+    requestToSpeakTimestamp: string | null;
+};
+export type ResolvedFile = APIAttachment;
+export type BaseMessageInteractiveComponentConstructor = new (...args: any[]) => BaseMessageInteractiveComponent;
 export type ArrayOrSingle<T> = T | T[];
+export type IfPartial<T, U, V = U | undefined> = T extends true ? V : U;
 export * from "./listeners.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC/D,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iDAAiD,CAAA;AACtG,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AACnE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,+BAA+B,CAAA;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAA;AACzE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,8BAA8B,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAA;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAA;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAA;AAEvE,MAAM,MAAM,eAAe,GAAG,kBAAkB,CAAA;AAChD,MAAM,MAAM,kBAAkB,GAC3B,GAAG,CAAC,+BAA+B,CAAC,GACpC,SAAS,GACT,IAAI,GACJ,YAAY,GACZ,OAAO,GACP,SAAS,GACT,WAAW,CAAA;AAEd;;;GAGG;AACH,MAAM,MAAM,cAAc,GACvB;IACA;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,EAAE,CAAA;IACjC;;OAEG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;OAEG;IACH,GAAG,CAAC,EAAE,OAAO,CAAA;IACb;;OAEG;IACH,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAC3B,GACD,MAAM,CAAA;AAET;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAChC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;IACZ;;OAEG;IACH,IAAI,EAAE,IAAI,CAAA;IACV;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAA;AAEtC,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"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"}

package/dist/src/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AA+EA,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAwJA,cAAc,gBAAgB,CAAA"}

package/dist/src/types/listeners.d.ts

@@ -6,6 +6,7 @@ import type { GuildMember } from "../structures/GuildMember.js";
 import type { GuildThreadChannel } from "../structures/GuildThreadChannel.js";
 import type { Message } from "../structures/Message.js";
 import type { Role } from "../structures/Role.js";
+import type { ThreadMember } from "../structures/ThreadMember.js";
 import type { User } from "../structures/User.js";
 export declare const WebhookEvent: {
     ApplicationAuthorized: ApplicationWebhookEventType.ApplicationAuthorized;
@@ -249,47 +250,52 @@ export type ListenerEventRawData = {
     [ListenerEvent.VoiceChannelEffectSend]: GatewayVoiceChannelEffectSendDispatchData;
 };
 export type ListenerEventData = {
-    [ListenerEvent.ApplicationAuthorized]: {
+    [ListenerEvent.ApplicationAuthorized]: Omit<APIWebhookEventApplicationAuthorizedData, "guild" | "user"> & {
         guild?: Guild;
         user: User;
-    } & Omit<ListenerEventRawData[typeof ListenerEvent.ApplicationAuthorized], "guild" | "user">;
-    [ListenerEvent.EntitlementCreate]: APIWebhookEventEntitlementCreateData & {
+        rawGuild: APIWebhookEventApplicationAuthorizedData["guild"];
+        rawUser: APIWebhookEventApplicationAuthorizedData["user"];
+    };
+    [ListenerEvent.EntitlementCreate]: Omit<APIWebhookEventEntitlementCreateData, "guild" | "user"> & {
         guild?: Guild<true>;
         user?: User<true>;
     };
     [ListenerEvent.QuestUserEnrollment]: APIWebhookEventQuestUserEnrollmentData;
-    [ListenerEvent.ApplicationCommandPermissionsUpdate]: GatewayApplicationCommandPermissionsUpdateDispatchData & {
+    [ListenerEvent.ApplicationCommandPermissionsUpdate]: Omit<GatewayApplicationCommandPermissionsUpdateDispatchData, "guild"> & {
         guild: Guild<true>;
     };
-    [ListenerEvent.AutoModerationActionExecution]: GatewayAutoModerationActionExecutionDispatchData & {
+    [ListenerEvent.AutoModerationActionExecution]: Omit<GatewayAutoModerationActionExecutionDispatchData, "guild" | "user" | "message"> & {
         guild: Guild<true>;
         user: User<true>;
         message?: Message<true>;
     };
-    [ListenerEvent.AutoModerationRuleCreate]: GatewayAutoModerationRuleCreateDispatchData & {
+    [ListenerEvent.AutoModerationRuleCreate]: Omit<GatewayAutoModerationRuleCreateDispatchData, "guild" | "creator"> & {
         guild: Guild<true>;
         creator: User<true>;
     };
-    [ListenerEvent.AutoModerationRuleDelete]: GatewayAutoModerationRuleDeleteDispatchData & {
+    [ListenerEvent.AutoModerationRuleDelete]: Omit<GatewayAutoModerationRuleDeleteDispatchData, "guild" | "creator"> & {
         guild: Guild<true>;
         creator: User<true>;
     };
-    [ListenerEvent.AutoModerationRuleUpdate]: GatewayAutoModerationRuleUpdateDispatchData & {
+    [ListenerEvent.AutoModerationRuleUpdate]: Omit<GatewayAutoModerationRuleUpdateDispatchData, "guild" | "creator"> & {
         guild: Guild<true>;
         creator: User<true>;
     };
-    [ListenerEvent.ChannelCreate]: GatewayChannelCreateDispatchData & {
+    [ListenerEvent.ChannelCreate]: Omit<GatewayChannelCreateDispatchData, "channel"> & {
         channel?: AnyChannel;
+        rawChannel: GatewayChannelCreateDispatchData;
     };
-    [ListenerEvent.ChannelDelete]: GatewayChannelDeleteDispatchData & {
+    [ListenerEvent.ChannelDelete]: Omit<GatewayChannelDeleteDispatchData, "channel"> & {
         channel?: AnyChannel;
+        rawChannel: GatewayChannelDeleteDispatchData;
     };
-    [ListenerEvent.ChannelPinsUpdate]: GatewayChannelPinsUpdateDispatchData & {
+    [ListenerEvent.ChannelPinsUpdate]: Omit<GatewayChannelPinsUpdateDispatchData, "guild" | "channel"> & {
         guild?: Guild<true>;
         channel?: AnyChannel;
     };
-    [ListenerEvent.ChannelUpdate]: GatewayChannelUpdateDispatchData & {
+    [ListenerEvent.ChannelUpdate]: Omit<GatewayChannelUpdateDispatchData, "channel"> & {
         channel?: AnyChannel;
+        rawChannel: GatewayChannelUpdateDispatchData;
     };
     [ListenerEvent.EntitlementDelete]: GatewayEntitlementDeleteDispatchData & {
         guild?: Guild<true>;
@@ -304,18 +310,20 @@ export type ListenerEventData = {
         user: User<true>;
         target?: User<true>;
     };
-    [ListenerEvent.GuildBanAdd]: GatewayGuildBanAddDispatchData & {
+    [ListenerEvent.GuildBanAdd]: Omit<GatewayGuildBanAddDispatchData, "user"> & {
         guild: Guild<true>;
+        rawUser: GatewayGuildBanAddDispatchData["user"];
         user: User<false>;
     };
-    [ListenerEvent.GuildBanRemove]: GatewayGuildBanRemoveDispatchData & {
+    [ListenerEvent.GuildBanRemove]: Omit<GatewayGuildBanRemoveDispatchData, "user"> & {
         guild: Guild<true>;
+        rawUser: GatewayGuildBanRemoveDispatchData["user"];
         user: User<false>;
     };
-    [ListenerEvent.GuildCreate]: GatewayGuildCreateDispatchData & {
+    [ListenerEvent.GuildCreate]: Omit<GatewayGuildCreateDispatchData, "guild"> & {
         guild: Guild;
     };
-    [ListenerEvent.GuildDelete]: GatewayGuildDeleteDispatchData & {
+    [ListenerEvent.GuildDelete]: Omit<GatewayGuildDeleteDispatchData, "guild"> & {
         guild: Guild<true>;
     };
     [ListenerEvent.GuildEmojisUpdate]: GatewayGuildEmojisUpdateDispatchData & {
@@ -324,36 +332,42 @@ export type ListenerEventData = {
     [ListenerEvent.GuildIntegrationsUpdate]: GatewayGuildIntegrationsUpdateDispatchData & {
         guild: Guild<true>;
     };
-    [ListenerEvent.GuildMemberAdd]: GatewayGuildMemberAddDispatchData & {
+    [ListenerEvent.GuildMemberAdd]: Omit<GatewayGuildMemberAddDispatchData, "guild" | "member"> & {
         guild: Guild<true>;
-        member: GuildMember;
+        member: GuildMember<false, true>;
     };
-    [ListenerEvent.GuildMemberRemove]: GatewayGuildMemberRemoveDispatchData & {
+    [ListenerEvent.GuildMemberRemove]: Omit<GatewayGuildMemberRemoveDispatchData, "user"> & {
         guild: Guild<true>;
         user: User<false>;
+        rawUser: GatewayGuildMemberRemoveDispatchData["user"];
     };
-    [ListenerEvent.GuildMemberUpdate]: GatewayGuildMemberUpdateDispatchData & {
+    [ListenerEvent.GuildMemberUpdate]: Omit<GatewayGuildMemberUpdateDispatchData, "member"> & {
         guild: Guild<true>;
-        member: GuildMember;
+        member: GuildMember<false, true>;
+        rawMember: GatewayGuildMemberUpdateDispatchData;
     };
-    [ListenerEvent.GuildMembersChunk]: GatewayGuildMembersChunkDispatchData & {
+    [ListenerEvent.GuildMembersChunk]: Omit<GatewayGuildMembersChunkDispatchData, "members"> & {
         guild: Guild<true>;
+        rawMembers: GatewayGuildMembersChunkDispatchData["members"];
         members: GuildMember<false, true>[];
     };
-    [ListenerEvent.GuildRoleCreate]: GatewayGuildRoleCreateDispatchData & {
+    [ListenerEvent.GuildRoleCreate]: Omit<GatewayGuildRoleCreateDispatchData, "role"> & {
         guild: Guild<true>;
+        rawRole: GatewayGuildRoleCreateDispatchData["role"];
         role: Role;
     };
     [ListenerEvent.GuildRoleDelete]: GatewayGuildRoleDeleteDispatchData & {
         guild: Guild<true>;
         role: Role<true>;
     };
-    [ListenerEvent.GuildRoleUpdate]: GatewayGuildRoleUpdateDispatchData & {
+    [ListenerEvent.GuildRoleUpdate]: Omit<GatewayGuildRoleUpdateDispatchData, "role"> & {
         guild: Guild<true>;
+        rawRole: GatewayGuildRoleUpdateDispatchData["role"];
         role: Role;
     };
-    [ListenerEvent.GuildScheduledEventCreate]: GatewayGuildScheduledEventCreateDispatchData & {
+    [ListenerEvent.GuildScheduledEventCreate]: Omit<GatewayGuildScheduledEventCreateDispatchData, "creator"> & {
         guild: Guild<true>;
+        rawCreator: GatewayGuildScheduledEventCreateDispatchData["creator"];
         creator?: User;
     };
     [ListenerEvent.GuildScheduledEventDelete]: GatewayGuildScheduledEventDeleteDispatchData & {
@@ -401,24 +415,30 @@ export type ListenerEventData = {
     [ListenerEvent.IntegrationUpdate]: GatewayIntegrationUpdateDispatchData & {
         guild: Guild<true>;
     };
-    [ListenerEvent.InteractionCreate]: GatewayInteractionCreateDispatchData & {
+    [ListenerEvent.InteractionCreate]: Omit<GatewayInteractionCreateDispatchData, "user"> & {
         guild?: Guild<true>;
-        member?: GuildMember;
         user: User;
+        rawUser: GatewayInteractionCreateDispatchData["user"];
     };
-    [ListenerEvent.InviteCreate]: GatewayInviteCreateDispatchData & {
-        guild: Guild<true>;
-        inviter?: User<true>;
-        targetUser?: User<true>;
+    [ListenerEvent.InviteCreate]: Omit<GatewayInviteCreateDispatchData, "inviter" | "target_user"> & {
+        guild?: Guild<true>;
+        inviter?: User;
+        targetUser?: User;
+        rawInviter: GatewayInviteCreateDispatchData["inviter"];
+        rawTargetUser: GatewayInviteCreateDispatchData["target_user"];
     };
     [ListenerEvent.InviteDelete]: GatewayInviteDeleteDispatchData & {
-        guild: Guild<true>;
+        guild?: Guild<true>;
+        channel?: Promise<AnyChannel>;
     };
-    [ListenerEvent.MessageCreate]: GatewayMessageCreateDispatchData & {
+    [ListenerEvent.MessageCreate]: Omit<GatewayMessageCreateDispatchData, "member" | "author"> & {
         guild?: Guild<true>;
         member?: GuildMember<false, true>;
         author: User;
         message: Message;
+        rawMessage: GatewayMessageCreateDispatchData;
+        rawMember: GatewayMessageCreateDispatchData["member"];
+        rawAuthor: GatewayMessageCreateDispatchData["author"];
     };
     [ListenerEvent.MessageDelete]: GatewayMessageDeleteDispatchData & {
         guild?: Guild<true>;
@@ -428,9 +448,10 @@ export type ListenerEventData = {
         guild?: Guild<true>;
         messages: Message<true>[];
     };
-    [ListenerEvent.MessageReactionAdd]: GatewayMessageReactionAddDispatchData & {
+    [ListenerEvent.MessageReactionAdd]: Omit<GatewayMessageReactionAddDispatchData, "member"> & {
         guild?: Guild<true>;
         member?: GuildMember;
+        rawMember: GatewayMessageReactionAddDispatchData["member"];
         user: User<true>;
         message: Message<true>;
     };
@@ -447,7 +468,7 @@ export type ListenerEventData = {
         guild?: Guild<true>;
         message: Message<true>;
     };
-    [ListenerEvent.MessageUpdate]: GatewayMessageUpdateDispatchData & {
+    [ListenerEvent.MessageUpdate]: Omit<GatewayMessageUpdateDispatchData, "message"> & {
         guild?: Guild<true>;
         message: Message;
     };
@@ -455,8 +476,9 @@ export type ListenerEventData = {
         guild: Guild<true>;
         user: User<true>;
     };
-    [ListenerEvent.Ready]: GatewayReadyDispatchData & {
+    [ListenerEvent.Ready]: Omit<GatewayReadyDispatchData, "user"> & {
         user: User;
+        rawUser: GatewayReadyDispatchData["user"];
     };
     [ListenerEvent.Resumed]: GatewayResumedDispatch["d"];
     [ListenerEvent.StageInstanceCreate]: GatewayStageInstanceCreateDispatchData & {
@@ -477,36 +499,40 @@ export type ListenerEventData = {
     [ListenerEvent.SubscriptionUpdate]: GatewaySubscriptionUpdateDispatchData & {
         user?: User<true>;
     };
-    [ListenerEvent.ThreadCreate]: GatewayThreadCreateDispatchData & {
+    [ListenerEvent.ThreadCreate]: Omit<GatewayThreadCreateDispatchData, "thread"> & {
         guild?: Guild<true>;
         thread: GuildThreadChannel<ThreadChannelType>;
     };
     [ListenerEvent.ThreadDelete]: GatewayThreadDeleteDispatchData & {
         guild: Guild<true>;
     };
-    [ListenerEvent.ThreadListSync]: GatewayThreadListSyncDispatchData & {
+    [ListenerEvent.ThreadListSync]: Omit<GatewayThreadListSyncDispatchData, "guild" | "threads"> & {
         guild: Guild<true>;
         threads: GuildThreadChannel<ThreadChannelType>[];
+        members: ThreadMember[];
+        rawMembers: GatewayThreadListSyncDispatchData["members"];
+        rawThreads: GatewayThreadListSyncDispatchData["threads"];
     };
     [ListenerEvent.ThreadMemberUpdate]: GatewayThreadMemberUpdateDispatchData & {
         guild: Guild<true>;
         thread: GuildThreadChannel<ThreadChannelType, true>;
-        member?: GuildMember<false, true>;
+        member?: ThreadMember;
     };
-    [ListenerEvent.ThreadMembersUpdate]: GatewayThreadMembersUpdateDispatchData & {
+    [ListenerEvent.ThreadMembersUpdate]: Omit<GatewayThreadMembersUpdateDispatchData, "thread"> & {
         guild: Guild<true>;
         thread: GuildThreadChannel<ThreadChannelType, true>;
-        addedMembers?: GuildMember<false, true>[];
+        addedMembers?: ThreadMember[];
         removedMembers?: User<true>[];
     };
-    [ListenerEvent.ThreadUpdate]: GatewayThreadUpdateDispatchData & {
+    [ListenerEvent.ThreadUpdate]: Omit<GatewayThreadUpdateDispatchData, "thread"> & {
         guild?: Guild<true>;
         thread: GuildThreadChannel<ThreadChannelType, true>;
     };
-    [ListenerEvent.TypingStart]: GatewayTypingStartDispatchData & {
+    [ListenerEvent.TypingStart]: Omit<GatewayTypingStartDispatchData, "member"> & {
         guild?: Guild<true>;
         member?: GuildMember<false, true>;
         user: User<true>;
+        rawMember: GatewayTypingStartDispatchData["member"];
     };
     [ListenerEvent.UserUpdate]: GatewayUserUpdateDispatchData & {
         user: User;
@@ -514,9 +540,10 @@ export type ListenerEventData = {
     [ListenerEvent.VoiceServerUpdate]: GatewayVoiceServerUpdateDispatchData & {
         guild: Guild<true>;
     };
-    [ListenerEvent.VoiceStateUpdate]: GatewayVoiceStateUpdateDispatchData & {
+    [ListenerEvent.VoiceStateUpdate]: Omit<GatewayVoiceStateUpdateDispatchData, "member"> & {
         guild?: Guild<true>;
         member?: GuildMember<false, true>;
+        rawMember: GatewayVoiceStateUpdateDispatchData["member"];
     };
     [ListenerEvent.WebhooksUpdate]: GatewayWebhooksUpdateDispatchData & {
         guild: Guild<true>;