lunibee 0.1.8 → 0.2.1

package/dist/structures/base.d.ts

@@ -24,7 +24,32 @@ export interface ResourceContext {
     removeAllReactions?(channelId: string, messageId: string): Promise<void>;
     pinMessage?(channelId: string, messageId: string): Promise<void>;
     unpinMessage?(channelId: string, messageId: string): Promise<void>;
+    /**
+     * A member's permissions from cached state: guild-level, or channel-level
+     * (with overwrites) when a channel ID is given. Null when the guild (or
+     * channel) is not cached.
+     */
+    memberPermissions?(guildId: string, memberId: string, roleIds: readonly string[], channelId?: string): import("@lunibee/core").PermissionSet | null;
+    kickMember?(guildId: string, userId: string, reason?: string): Promise<void>;
+    banMember?(guildId: string, userId: string, options?: {
+        reason?: string;
+        deleteMessageSeconds?: number;
+    }): Promise<void>;
+    editMember?(guildId: string, userId: string, options: Record<string, unknown>, reason?: string): Promise<import("./resources.js").GuildMember>;
+    addMemberRole?(guildId: string, userId: string, roleId: string, reason?: string): Promise<void>;
+    removeMemberRole?(guildId: string, userId: string, roleId: string, reason?: string): Promise<void>;
+    /** Collects the client's interactions (a `Collector` over `interactionCreate`). Used by message and interaction collectors. */
+    collectInteractions?(options: import("@lunibee/core").CollectorOptions<import("./interactions.js").Interaction>): import("@lunibee/core").Collector<string, import("./interactions.js").Interaction>;
+    editPermissionOverwrite?(channelId: string, targetId: string, changes: PermissionOverwriteChanges, options?: {
+        type?: 0 | 1;
+        reason?: string;
+    }): Promise<void>;
 }
+/**
+ * Permissions to change on one overwrite: `true` allows, `false` denies,
+ * `null` goes back to inheriting. Permissions not named keep their state.
+ */
+export type PermissionOverwriteChanges = Partial<Record<import("@lunibee/core").PermissionName, boolean | null>>;
 export declare const CDN_BASE = "https://cdn.discordapp.com";
 /** Options for CDN image URLs. */
 export interface ImageURLOptions {
@@ -67,6 +92,8 @@ export declare class Channel extends BaseStructure {
     nsfw?: boolean;
     rateLimitPerUser?: number;
     position?: number;
+    /** Role and member permission overwrites (empty for DMs and when not provided). */
+    permissionOverwrites: import("@lunibee/types").APIOverwrite[];
     /** Creates a channel structure from Discord channel data. */
     constructor(data: import("@lunibee/types").APIChannel, context?: ResourceContext);
     /** Sends a message to this channel. @param options Message payload. @returns The created message. @throws {Error} If the channel is not attached to a client. */
@@ -84,6 +111,17 @@ export declare class Channel extends BaseStructure {
     /** Changes only this channel's topic. @param topic New topic, or null to clear it. @returns The updated channel. @throws {Error} If the channel is not attached to a client. */
     editTopic(topic: string | null): Promise<Channel>;
     /** Moves this channel to another parent category. @param parentId Parent category ID, or null to remove the parent. @returns The updated channel. @throws {Error} If the channel is not attached to a client. */
+    /**
+     * Changes some permissions of one overwrite and keeps the rest: `true`
+     * allows, `false` denies, `null` resets to inherited.
+     * @param targetId Role or member ID. @param changes Permissions to change.
+     * @param options `type` (0 role, 1 member) when the overwrite does not exist yet; audit-log `reason`.
+     * @example channel.editPermissionOverwrite(userId, { ViewChannel: true, SendMessages: false }, { type: 1 })
+     */
+    editPermissionOverwrite(targetId: string, changes: PermissionOverwriteChanges, options?: {
+        type?: 0 | 1;
+        reason?: string;
+    }): Promise<void>;
     editParent(parentId: string | null): Promise<Channel>;
     /** Deletes this channel. @returns A promise fulfilled when Discord confirms deletion. @throws {Error} If the channel is not attached to a client. */
     delete(): Promise<void>;

package/dist/structures/index.d.ts

@@ -1,5 +1,13 @@
 /** Resource structures for Discord messages and related entities. */
 import { BaseStructure, Channel, User } from "./base.js";
+import { GuildMember } from "./resources.js";
+import type { ComponentInteraction } from "./interactions.js";
+import type { Collector, CollectorOptions } from "@lunibee/core";
+/** Options for {@link Message.createComponentCollector}. */
+export interface ComponentCollectorOptions extends CollectorOptions<ComponentInteraction> {
+    /** Only this component type (2 button, 3 string select...). */
+    componentType?: number;
+}
 import type { ResourceContext } from "./base.js";
 export { BaseStructure, Channel, Guild, User } from "./base.js";
 export type { ResourceContext } from "./base.js";
@@ -23,6 +31,12 @@ export declare class Message extends BaseStructure {
     readonly reference?: import("@lunibee/types").APIMessageReference;
     readonly components: import("@lunibee/types").APIMessageComponent[];
     readonly referencedMessage?: Message | null;
+    /**
+     * The author as a guild member, on guild messages from the Gateway. Its
+     * `permissions` are computed from the cached roles; `member.kick()` and the
+     * other member actions work when the message came from a client.
+     */
+    member: GuildMember | null;
     /** Creates a message structure from Discord message data. */
     constructor(data: import("@lunibee/types").APIMessage, context?: ResourceContext);
     /** Whether embeds are suppressed on this message. */
@@ -49,6 +63,21 @@ export declare class Message extends BaseStructure {
     })): Promise<Message>;
     /** Crossposts this message. @returns The resulting message. @throws {Error} If the message is not attached to a client. */
     crosspost(): Promise<Message>;
+    /**
+     * Collects clicks and picks on this message's components. It always ends:
+     * after `time`, or 15 minutes (an interaction token's life) when neither
+     * `time` nor `idle` is set.
+     * @example
+     * const collector = message.createComponentCollector({ filter: (i) => i.user?.id === authorId, time: 60_000 });
+     * collector.on("collect", (i) => i.update({ content: `Picked ${i.customId}` }));
+     */
+    createComponentCollector(options?: ComponentCollectorOptions): Collector<string, ComponentInteraction>;
+    /**
+     * Waits for the next click or pick on this message's components.
+     * @param options `time` (default 15 minutes), `filter`, `componentType`.
+     * @returns The interaction. @throws {Error} When time runs out first.
+     */
+    awaitComponent(options?: Omit<ComponentCollectorOptions, "max">): Promise<ComponentInteraction>;
     /** Adds a reaction to this message. @param emoji Emoji identifier. @returns A promise fulfilled when the reaction is added. @throws {Error} If reactions are unavailable. */
     react(emoji: string): Promise<void>;
     /** Removes a reaction from this message. @param emoji Emoji identifier. @param userId User whose reaction should be removed; omit to remove the current user's reaction. @returns A promise fulfilled when the reaction is removed. @throws {Error} If reaction operations are unavailable. */

package/dist/structures/index.js

@@ -71,6 +71,7 @@ class Channel extends BaseStructure {
   nsfw;
   rateLimitPerUser;
   position;
+  permissionOverwrites;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -84,6 +85,7 @@ class Channel extends BaseStructure {
     this.nsfw = data.nsfw;
     this.rateLimitPerUser = data.rate_limit_per_user;
     this.position = data.position;
+    this.permissionOverwrites = (data.permission_overwrites ?? []).map((overwrite) => ({ ...overwrite }));
     this.#context = context;
   }
   sendMessage(options) {
@@ -107,6 +109,11 @@ class Channel extends BaseStructure {
   editTopic(topic) {
     return this.edit({ topic });
   }
+  editPermissionOverwrite(targetId, changes, options) {
+    if (!this.#context?.editPermissionOverwrite)
+      throw new Error("This channel is not attached to a client.");
+    return this.#context.editPermissionOverwrite(this.id, targetId, changes, options);
+  }
   editParent(parentId) {
     return this.edit({ parent_id: parentId });
   }
@@ -241,6 +248,7 @@ class Guild extends BaseStructure {
     return this.name;
   }
 }
+
 // packages/core/src/permissions.ts
 var Permission = {
   createInstantInvite: 1n << 0n,
@@ -290,8 +298,11 @@ var Permission = {
   createEvents: 1n << 44n,
   useExternalSounds: 1n << 45n,
   sendVoiceMessages: 1n << 46n,
+  setVoiceChannelStatus: 1n << 48n,
   sendPolls: 1n << 49n,
-  useExternalApps: 1n << 50n
+  useExternalApps: 1n << 50n,
+  pinMessages: 1n << 51n,
+  bypassSlowmode: 1n << 52n
 };
 var Permissions = {
   CreateInstantInvite: 1n << 0n,
@@ -341,8 +352,11 @@ var Permissions = {
   CreateEvents: 1n << 44n,
   UseExternalSounds: 1n << 45n,
   SendVoiceMessages: 1n << 46n,
+  SetVoiceChannelStatus: 1n << 48n,
   SendPolls: 1n << 49n,
-  UseExternalApps: 1n << 50n
+  UseExternalApps: 1n << 50n,
+  PinMessages: 1n << 51n,
+  BypassSlowmode: 1n << 52n
 };
 var PermissionFlagsBits = {
   CreateInstantInvite: 1n << 0n,
@@ -392,8 +406,11 @@ var PermissionFlagsBits = {
   CreateEvents: 1n << 44n,
   UseExternalSounds: 1n << 45n,
   SendVoiceMessages: 1n << 46n,
+  SetVoiceChannelStatus: 1n << 48n,
   SendPolls: 1n << 49n,
-  UseExternalApps: 1n << 50n
+  UseExternalApps: 1n << 50n,
+  PinMessages: 1n << 51n,
+  BypassSlowmode: 1n << 52n
 };
 
 class PermissionSet {
@@ -595,6 +612,10 @@ class PermissionSet {
     }
     return false;
   }
+  missing(...permissions) {
+    const wanted = new PermissionSet(permissions);
+    return wanted.toArray().filter((name) => !this.has(name));
+  }
   add(...permissions) {
     let bitfield = this.bitfield;
     for (let i = 0;i < permissions.length; i++) {
@@ -620,6 +641,11 @@ class PermissionSet {
   toArray() {
     return Object.keys(Permission).filter((permission) => this.has(permission));
   }
+  static #renamed = {
+    ManageEmojisAndStickers: "ManageGuildExpressions",
+    ManageEmojis: "ManageGuildExpressions",
+    UseSlashCommands: "UseApplicationCommands"
+  };
   #resolve(permission) {
     if (typeof permission === "bigint")
       return permission;
@@ -634,6 +660,9 @@ class PermissionSet {
       return bit;
     }
     if (typeof permission === "string") {
+      const renamed = PermissionSet.#renamed[permission];
+      if (renamed)
+        return this.#resolve(renamed);
       if (permission in Permission)
         return Permission[permission];
       if (permission in Permissions)
@@ -656,6 +685,7 @@ class PermissionsBitField extends PermissionSet {
     super(value);
   }
 }
+var ALL_PERMISSIONS = Object.values(Permission).reduce((bits, bit) => bits | bit, 0n);
 // packages/types/src/gateway.ts
 var GatewayIntentBits = {
   Guilds: 1 << 0,
@@ -721,7 +751,7 @@ var InteractionResponseType = {
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.1.8",
+  version: "0.2.1",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -743,6 +773,9 @@ var REQUEST_DATA_KEYS = new Set([
   "auth",
   "signal"
 ]);
+// packages/managers/src/index.ts
+var BULK_DELETE_MAX_AGE_MS = 14 * 24 * 60 * 60000;
+
 // packages/ws/src/close-codes.ts
 var GatewayCloseCodes = {
   UnknownError: 4000,
@@ -789,13 +822,15 @@ class GuildMember {
   roleIds;
   pending;
   joinedAt;
-  permissions;
   avatarHash;
   premiumSince;
   timedOutUntil;
   flags;
-  constructor(data) {
+  #suppliedPermissions;
+  #context;
+  constructor(data, context) {
     this.user = new User(data.user);
+    this.#context = context;
     if (!/^\d{1,20}$/.test(data.guild_id))
       throw new TypeError("Member guild_id must be a valid snowflake.");
     this.guildId = data.guild_id;
@@ -805,12 +840,53 @@ class GuildMember {
     this.joinedAt = data.joined_at ? new Date(data.joined_at) : undefined;
     if (this.joinedAt?.toString() === "Invalid Date")
       throw new RangeError("Member joined_at must be a valid date.");
-    this.permissions = new PermissionsBitField(data.permissions ?? 0n);
+    if (data.permissions !== undefined)
+      this.#suppliedPermissions = new PermissionsBitField(data.permissions);
     this.avatarHash = data.avatar ?? null;
     this.premiumSince = toDateOrNull(data.premium_since);
     this.timedOutUntil = toDateOrNull(data.communication_disabled_until);
     this.flags = data.flags ?? 0;
   }
+  get permissions() {
+    if (this.#suppliedPermissions)
+      return this.#suppliedPermissions;
+    return new PermissionsBitField(this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds) ?? 0n);
+  }
+  permissionsIn(channelId) {
+    const computed = this.#context?.memberPermissions?.(this.guildId, this.user.id, this.roleIds, channelId);
+    return computed ? new PermissionsBitField(computed) : null;
+  }
+  #action(name) {
+    const action = this.#context?.[name];
+    if (!action)
+      throw new Error("This member is not attached to a client.");
+    return action;
+  }
+  kick(reason) {
+    return this.#action("kickMember")(this.guildId, this.user.id, reason);
+  }
+  ban(options = {}) {
+    return this.#action("banMember")(this.guildId, this.user.id, options);
+  }
+  edit(options, reason) {
+    return this.#action("editMember")(this.guildId, this.user.id, options, reason);
+  }
+  timeout(milliseconds, reason) {
+    if (milliseconds !== null && !(milliseconds > 0))
+      throw new RangeError("Timeout length must be a positive number of milliseconds.");
+    return this.edit({
+      communication_disabled_until: milliseconds === null ? null : new Date(Date.now() + milliseconds).toISOString()
+    }, reason);
+  }
+  setNickname(nickname, reason) {
+    return this.edit({ nick: nickname }, reason);
+  }
+  addRole(roleId, reason) {
+    return this.#action("addMemberRole")(this.guildId, this.user.id, roleId, reason);
+  }
+  removeRole(roleId, reason) {
+    return this.#action("removeMemberRole")(this.guildId, this.user.id, roleId, reason);
+  }
   get displayName() {
     return this.nickname ?? this.user.displayName;
   }
@@ -1344,6 +1420,17 @@ class CommandOptions {
       throw new TypeError(`Resolved mentionable for option "${name}" is missing.`);
     return resolved;
   }
+  getMentionableType(name) {
+    const opt = this.#get(name);
+    if (!opt || opt.type !== OptionType.Mentionable)
+      return null;
+    const id = String(opt.value);
+    if (this.#resolved?.users?.[id])
+      return "user";
+    if (this.#resolved?.roles?.[id])
+      return "role";
+    return null;
+  }
   getAttachment(name, required = false) {
     const opt = this.#get(name);
     if (!opt || opt.type !== OptionType.Attachment) {
@@ -1369,6 +1456,17 @@ var InteractionType = {
   ApplicationCommandAutocomplete: 4,
   ModalSubmit: 5
 };
+var EPHEMERAL = 64;
+var TOKEN_LIFETIME_MS = 15 * 60000;
+var DISCORD_EPOCH = 1420070400000n;
+function toMessageData(options) {
+  if (typeof options === "string")
+    return { content: options };
+  const { ephemeral, ...data } = options;
+  if (ephemeral)
+    data.flags = (typeof data.flags === "number" ? data.flags : 0) | EPHEMERAL;
+  return data;
+}
 
 class InteractionResponse {
   type;
@@ -1383,14 +1481,10 @@ class InteractionResponse {
     return this.data === undefined ? { type: this.type } : { type: this.type, data: this.data };
   }
   static message(options) {
-    const data = { ...options };
-    if (options.ephemeral) {
-      data.flags = (typeof options.flags === "number" ? options.flags : 0) | 64;
-    }
-    return new InteractionResponse(InteractionResponseType.ChannelMessage, data);
+    return new InteractionResponse(InteractionResponseType.ChannelMessage, toMessageData(options));
   }
   static defer(ephemeral = false) {
-    return new InteractionResponse(InteractionResponseType.DeferredChannelMessage, ephemeral ? { flags: 64 } : undefined);
+    return new InteractionResponse(InteractionResponseType.DeferredChannelMessage, ephemeral ? { flags: EPHEMERAL } : undefined);
   }
   static pong() {
     return new InteractionResponse(InteractionResponseType.Pong);
@@ -1408,6 +1502,7 @@ class Interaction {
   replied = false;
   deferred = false;
   #client;
+  #acknowledging = false;
   constructor(client, data) {
     if (!data.id || !data.token)
       throw new TypeError("Interaction ID and token are required.");
@@ -1423,6 +1518,20 @@ class Interaction {
   isChatInputCommand() {
     return this.type === InteractionType.ApplicationCommand;
   }
+  awaitModalSubmit(options) {
+    const collect = this.#client.resourceContext?.collectInteractions;
+    if (!collect)
+      return Promise.reject(new Error("This interaction is not attached to a client."));
+    if (!(options.time > 0))
+      return Promise.reject(new RangeError("awaitModalSubmit needs a positive time."));
+    const userId = this.user?.id;
+    const collector = collect({
+      time: options.time,
+      max: 1,
+      filter: async (interaction) => interaction.isModalSubmit() && interaction.user?.id === userId && (options.customId === undefined || interaction.customId === options.customId) && (options.filter ? await options.filter(interaction) : true)
+    });
+    return collector.next();
+  }
   isMessageComponent() {
     return this.type === InteractionType.MessageComponent;
   }
@@ -1457,9 +1566,57 @@ class Interaction {
     return [3, 5, 6, 7, 8].includes(this.#componentType());
   }
   assertUnacknowledged() {
-    if (this.replied || this.deferred)
+    if (this.replied || this.deferred || this.#acknowledging)
       throw new Error("Interaction has already been acknowledged.");
   }
+  async acknowledge(response, state) {
+    this.assertUnacknowledged();
+    this.#acknowledging = true;
+    try {
+      const result = await this.postResponse(response);
+      this[state] = true;
+      return result;
+    } finally {
+      this.#acknowledging = false;
+    }
+  }
+  get user() {
+    const raw = this.data.member?.user ?? this.data.user;
+    return raw ? new User(raw) : null;
+  }
+  get member() {
+    const raw = this.data.member;
+    if (!raw || !this.guildId)
+      return null;
+    return new GuildMember({
+      ...raw,
+      guild_id: this.guildId
+    }, this.#client.resourceContext);
+  }
+  get createdTimestamp() {
+    return Number((BigInt(this.id) >> 22n) + DISCORD_EPOCH);
+  }
+  get expiresAt() {
+    return new Date(this.createdTimestamp + TOKEN_LIFETIME_MS);
+  }
+  get isExpired() {
+    return Date.now() >= this.createdTimestamp + TOKEN_LIFETIME_MS;
+  }
+  #webhookMessage(method, messageId, data) {
+    if (!this.#client.interactionWebhookMessage)
+      return Promise.reject(new Error("This interaction client does not support webhook message access."));
+    return this.#client.interactionWebhookMessage(method, this.applicationId, this.token, messageId, data);
+  }
+  fetchReply() {
+    this.assertAcknowledged();
+    return this.#webhookMessage("GET", "@original");
+  }
+  editFollowUp(messageId, options) {
+    return this.#webhookMessage("PATCH", messageId, toMessageData(options));
+  }
+  async deleteFollowUp(messageId) {
+    await this.#webhookMessage("DELETE", messageId);
+  }
   assertAcknowledged() {
     if (!this.replied && !this.deferred)
       throw new Error("Interaction has not been acknowledged.");
@@ -1468,41 +1625,29 @@ class Interaction {
     return this.#client.postInteractionResponse(this.id, this.token, response);
   }
   async reply(options) {
-    this.assertUnacknowledged();
-    const payload = typeof options === "string" ? { content: options } : options;
-    const result = await this.#client.postInteractionResponse(this.id, this.token, InteractionResponse.message(payload));
-    this.replied = true;
-    return result;
+    return this.acknowledge(InteractionResponse.message(toMessageData(options)), "replied");
   }
-  async deferReply(ephemeral = false) {
-    this.assertUnacknowledged();
-    await this.#client.postInteractionResponse(this.id, this.token, InteractionResponse.defer(ephemeral));
-    this.deferred = true;
+  async deferReply(options = false) {
+    const ephemeral = typeof options === "boolean" ? options : options.ephemeral === true;
+    await this.acknowledge(InteractionResponse.defer(ephemeral), "deferred");
   }
   editReply(options) {
     this.assertAcknowledged();
-    return this.#client.editInteractionReply(this.token, options);
+    return this.#client.editInteractionReply(this.token, toMessageData(options));
   }
   deleteReply() {
     this.assertAcknowledged();
     return this.#client.deleteInteractionReply(this.token);
   }
   followUp(options) {
-    const payload = typeof options === "string" ? { content: options } : options;
-    return this.#client.followUpInteraction(this.token, payload);
+    return this.#client.followUpInteraction(this.token, toMessageData(options));
   }
   async update(options) {
-    this.assertUnacknowledged();
-    const payload = typeof options === "string" ? { content: options } : options;
-    const result = await this.#client.postInteractionResponse(this.id, this.token, new InteractionResponse(InteractionResponseType.MessageUpdate, payload));
-    this.replied = true;
-    return result;
+    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
   }
   async showModal(modal) {
-    this.assertUnacknowledged();
-    const result = await this.#client.postInteractionResponse(this.id, this.token, new InteractionResponse(InteractionResponseType.Modal, modal));
-    this.replied = true;
-    return result;
+    const data = "toJSON" in modal && typeof modal.toJSON === "function" ? modal.toJSON() : modal;
+    return this.acknowledge(new InteractionResponse(InteractionResponseType.Modal, data), "replied");
   }
 }
 
@@ -1523,6 +1668,9 @@ class ComponentInteraction extends Interaction {
   get customId() {
     return this.data?.data?.custom_id ?? "";
   }
+  get messageId() {
+    return this.data?.message?.id;
+  }
   get componentType() {
     return this.data?.data?.component_type ?? 0;
   }
@@ -1530,16 +1678,10 @@ class ComponentInteraction extends Interaction {
     return this.data?.data?.values ?? [];
   }
   async deferUpdate() {
-    this.assertUnacknowledged();
-    await this.postResponse(new InteractionResponse(InteractionResponseType.DeferredMessageUpdate));
-    this.deferred = true;
+    await this.acknowledge(new InteractionResponse(InteractionResponseType.DeferredMessageUpdate), "deferred");
   }
   async update(options) {
-    this.assertUnacknowledged();
-    const payload = typeof options === "string" ? { content: options } : options;
-    const result = await this.postResponse(new InteractionResponse(InteractionResponseType.MessageUpdate, payload));
-    this.replied = true;
-    return result;
+    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
   }
 }
 
@@ -1582,8 +1724,7 @@ class AutocompleteInteraction extends Interaction {
     if (!Array.isArray(choices))
       throw new TypeError("Autocomplete choices must be an array.");
     const response = new InteractionResponse(InteractionResponseType.Autocomplete, { choices });
-    await this.postResponse(response);
-    this.replied = true;
+    await this.acknowledge(response, "replied");
   }
 }
 function findFocused(options) {
@@ -1780,6 +1921,7 @@ class AuditLog {
 }
 
 // packages/structures/src/index.ts
+var COMPONENT_COLLECTOR_DEFAULT_TIME = 15 * 60000;
 var NON_SYSTEM_MESSAGE_TYPES = new Set([0, 19, 20, 23]);
 
 class Message extends BaseStructure {
@@ -1800,6 +1942,7 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  member;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -1822,6 +1965,11 @@ class Message extends BaseStructure {
     this.reference = data.message_reference;
     this.referencedMessage = data.referenced_message ? new Message(data.referenced_message, context) : data.referenced_message === null ? null : undefined;
     this.#context = context;
+    this.member = data.member && data.guild_id ? new GuildMember({
+      ...data.member,
+      user: data.member.user ?? data.author,
+      guild_id: data.guild_id
+    }, context) : null;
     this.channel = new Channel({ id: data.channel_id, type: 0, guild_id: data.guild_id }, context);
   }
   get embedsSuppressed() {
@@ -1862,6 +2010,20 @@ class Message extends BaseStructure {
       throw new Error("This message is not attached to a client.");
     return this.#context.crosspostMessage(this.channelId, this.id);
   }
+  createComponentCollector(options = {}) {
+    const collect = this.#context?.collectInteractions;
+    if (!collect)
+      throw new Error("This message is not attached to a client.");
+    const { componentType, filter, ...rest } = options;
+    return collect({
+      ...rest,
+      time: rest.time ?? (rest.idle ? undefined : COMPONENT_COLLECTOR_DEFAULT_TIME),
+      filter: async (interaction) => interaction.isMessageComponent() && interaction.messageId === this.id && (componentType === undefined || interaction.componentType === componentType) && (filter ? await filter(interaction) : true)
+    });
+  }
+  awaitComponent(options = {}) {
+    return this.createComponentCollector({ ...options, max: 1 }).next();
+  }
   react(emoji) {
     if (!this.#context?.addReaction)
       throw new Error("This message is not attached to a client.");
@@ -1977,4 +2139,4 @@ export {
   createInteraction
 };
 
-//# debugId=8FB0F7F12180BD8364756E2164756E21
+//# debugId=56391DD25556C30C64756E2164756E21