lunibee 0.2.0 → 0.2.2

package/dist/core/index.js

@@ -1,10 +1,11 @@
 // @bun
 // packages/core/src/permissions.ts
-var PermissionOverwriteType;
-((PermissionOverwriteType) => {
-  PermissionOverwriteType[PermissionOverwriteType["Role"] = 0] = "Role";
-  PermissionOverwriteType[PermissionOverwriteType["Member"] = 1] = "Member";
-})(PermissionOverwriteType ||= {});
+var PermissionOverwriteEnum;
+((PermissionOverwriteEnum) => {
+  PermissionOverwriteEnum[PermissionOverwriteEnum["Role"] = 0] = "Role";
+  PermissionOverwriteEnum[PermissionOverwriteEnum["Member"] = 1] = "Member";
+})(PermissionOverwriteEnum ||= {});
+var PermissionOverwriteType = PermissionOverwriteEnum;
 var Permission = {
   createInstantInvite: 1n << 0n,
   kickMembers: 1n << 1n,
@@ -396,6 +397,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;
@@ -410,6 +416,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)
@@ -794,7 +803,7 @@ class IntentsBitField {
   }
 }
 // packages/types/src/index.ts
-var InteractionResponseType = {
+var InteractionResponseEnum = {
   Pong: 1,
   ChannelMessage: 4,
   DeferredChannelMessage: 5,
@@ -1455,7 +1464,7 @@ class ResourceManager extends Manager {
 // packages/rest/package.json
 var package_default = {
   name: "@lunibee/rest",
-  version: "0.2.0",
+  version: "0.2.2",
   type: "module",
   module: "./src/index.ts",
   types: "./src/index.ts",
@@ -2263,6 +2272,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 });
   }
@@ -2397,6 +2411,7 @@ class Guild extends BaseStructure {
     return this.name;
   }
 }
+
 // packages/structures/src/resources.ts
 function toDateOrNull(value) {
   if (!value)
@@ -2412,13 +2427,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;
@@ -2428,12 +2445,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;
   }
@@ -2827,6 +2885,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) {
@@ -2845,7 +2914,7 @@ class CommandOptions {
   }
 }
 // packages/structures/src/interactions.ts
-var InteractionType = {
+var InteractionEnum = {
   Ping: 1,
   ApplicationCommand: 2,
   MessageComponent: 3,
@@ -2853,8 +2922,17 @@ var InteractionType = {
   ModalSubmit: 5
 };
 var EPHEMERAL = 64;
+var COMMAND_CHAT_INPUT = 1;
+var COMMAND_USER = 2;
+var COMMAND_MESSAGE = 3;
 var TOKEN_LIFETIME_MS = 15 * 60000;
 var DISCORD_EPOCH = 1420070400000n;
+function splitWithResponse(options) {
+  if (typeof options === "string")
+    return { withResponse: false, rest: options };
+  const { withResponse, ...rest } = options;
+  return { withResponse: withResponse === true, rest };
+}
 function toMessageData(options) {
   if (typeof options === "string")
     return { content: options };
@@ -2867,6 +2945,7 @@ function toMessageData(options) {
 class InteractionResponse {
   type;
   data;
+  withResponse = false;
   constructor(type, data) {
     if (!Number.isFinite(type))
       throw new TypeError("Interaction response type must be finite.");
@@ -2877,13 +2956,13 @@ class InteractionResponse {
     return this.data === undefined ? { type: this.type } : { type: this.type, data: this.data };
   }
   static message(options) {
-    return new InteractionResponse(InteractionResponseType.ChannelMessage, toMessageData(options));
+    return new InteractionResponse(InteractionResponseEnum.ChannelMessage, toMessageData(options));
   }
   static defer(ephemeral = false) {
-    return new InteractionResponse(InteractionResponseType.DeferredChannelMessage, ephemeral ? { flags: EPHEMERAL } : undefined);
+    return new InteractionResponse(InteractionResponseEnum.DeferredChannelMessage, ephemeral ? { flags: EPHEMERAL } : undefined);
   }
   static pong() {
-    return new InteractionResponse(InteractionResponseType.Pong);
+    return new InteractionResponse(InteractionResponseEnum.Pong);
   }
 }
 
@@ -2911,17 +2990,53 @@ class Interaction {
     this.type = data.type;
     this.data = data;
   }
+  #commandType() {
+    if (this.type !== InteractionEnum.ApplicationCommand)
+      return 0;
+    const type = this.data.data?.type;
+    return typeof type === "number" ? type : COMMAND_CHAT_INPUT;
+  }
+  isCommand() {
+    return this.type === InteractionEnum.ApplicationCommand;
+  }
   isChatInputCommand() {
-    return this.type === InteractionType.ApplicationCommand;
+    return this.#commandType() === COMMAND_CHAT_INPUT;
+  }
+  isContextMenuCommand() {
+    const type = this.#commandType();
+    return type === COMMAND_USER || type === COMMAND_MESSAGE;
+  }
+  isUserContextMenuCommand() {
+    return this.#commandType() === COMMAND_USER;
+  }
+  isMessageContextMenuCommand() {
+    return this.#commandType() === COMMAND_MESSAGE;
+  }
+  get resourceContext() {
+    return this.#client.resourceContext;
+  }
+  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;
+    return this.type === InteractionEnum.MessageComponent;
   }
   isModalSubmit() {
-    return this.type === InteractionType.ModalSubmit;
+    return this.type === InteractionEnum.ModalSubmit;
   }
   isAutocomplete() {
-    return this.type === InteractionType.ApplicationCommandAutocomplete;
+    return this.type === InteractionEnum.ApplicationCommandAutocomplete;
   }
   #componentType() {
     return this.isMessageComponent() ? this.data.data?.component_type ?? 0 : 0;
@@ -2973,7 +3088,7 @@ class Interaction {
     return new GuildMember({
       ...raw,
       guild_id: this.guildId
-    });
+    }, this.#client.resourceContext);
   }
   get createdTimestamp() {
     return Number((BigInt(this.id) >> 22n) + DISCORD_EPOCH);
@@ -3006,11 +3121,24 @@ class Interaction {
   postResponse(response) {
     return this.#client.postInteractionResponse(this.id, this.token, response);
   }
-  async reply(options) {
-    return this.acknowledge(InteractionResponse.message(toMessageData(options)), "replied");
+  async acknowledgeWith(response, state, withResponse) {
+    response.withResponse = withResponse;
+    const result = await this.acknowledge(response, state);
+    if (!withResponse)
+      return result;
+    const message = result?.resource?.message;
+    return message ? new Message(message, this.#client.resourceContext) : null;
   }
-  async deferReply(ephemeral = false) {
-    await this.acknowledge(InteractionResponse.defer(ephemeral), "deferred");
+  async reply(options) {
+    const { withResponse, rest } = splitWithResponse(options);
+    return this.acknowledgeWith(InteractionResponse.message(toMessageData(rest)), "replied", withResponse);
+  }
+  async deferReply(options = false) {
+    const ephemeral = typeof options === "boolean" ? options : options.ephemeral === true;
+    const withResponse = typeof options === "object" && options.withResponse === true;
+    const result = await this.acknowledgeWith(InteractionResponse.defer(ephemeral), "deferred", withResponse);
+    if (withResponse)
+      return result;
   }
   editReply(options) {
     this.assertAcknowledged();
@@ -3024,10 +3152,12 @@ class Interaction {
     return this.#client.followUpInteraction(this.token, toMessageData(options));
   }
   async update(options) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
+    const { withResponse, rest } = splitWithResponse(options);
+    return this.acknowledgeWith(new InteractionResponse(InteractionResponseEnum.MessageUpdate, toMessageData(rest)), "replied", withResponse);
   }
   async showModal(modal) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.Modal, modal), "replied");
+    const data = "toJSON" in modal && typeof modal.toJSON === "function" ? modal.toJSON() : modal;
+    return this.acknowledge(new InteractionResponse(InteractionResponseEnum.Modal, data), "replied");
   }
 }
 
@@ -3044,21 +3174,56 @@ class CommandInteraction extends Interaction {
   }
 }
 
+class ContextMenuCommandInteraction extends CommandInteraction {
+  #resolved() {
+    return this.data.data?.resolved ?? {};
+  }
+  get targetId() {
+    const id = this.data.data?.target_id;
+    return typeof id === "string" ? id : null;
+  }
+  get targetUser() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().users?.[id] : undefined;
+    return raw ? new User(raw) : null;
+  }
+  get targetMember() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().members?.[id] : undefined;
+    const user = id ? this.#resolved().users?.[id] : undefined;
+    if (!raw || !user || !this.guildId)
+      return null;
+    return new GuildMember({
+      ...raw,
+      user,
+      guild_id: this.guildId
+    }, this.resourceContext);
+  }
+  get targetMessage() {
+    const id = this.targetId;
+    const raw = id ? this.#resolved().messages?.[id] : undefined;
+    return raw ? new Message(raw, this.resourceContext) : null;
+  }
+}
+
 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;
   }
   get values() {
     return this.data?.data?.values ?? [];
   }
-  async deferUpdate() {
-    await this.acknowledge(new InteractionResponse(InteractionResponseType.DeferredMessageUpdate), "deferred");
-  }
-  async update(options) {
-    return this.acknowledge(new InteractionResponse(InteractionResponseType.MessageUpdate, toMessageData(options)), "replied");
+  async deferUpdate(options = {}) {
+    const withResponse = options.withResponse === true;
+    const result = await this.acknowledgeWith(new InteractionResponse(InteractionResponseEnum.DeferredMessageUpdate), "deferred", withResponse);
+    if (withResponse)
+      return result;
   }
 }
 
@@ -3100,7 +3265,7 @@ class AutocompleteInteraction extends Interaction {
   async respond(choices) {
     if (!Array.isArray(choices))
       throw new TypeError("Autocomplete choices must be an array.");
-    const response = new InteractionResponse(InteractionResponseType.Autocomplete, { choices });
+    const response = new InteractionResponse(InteractionResponseEnum.Autocomplete, { choices });
     await this.acknowledge(response, "replied");
   }
 }
@@ -3118,13 +3283,15 @@ function findFocused(options) {
 }
 function createInteraction(client, data) {
   switch (data.type) {
-    case InteractionType.ApplicationCommand:
-      return new CommandInteraction(client, data);
-    case InteractionType.ApplicationCommandAutocomplete:
+    case InteractionEnum.ApplicationCommand: {
+      const commandType = data.data?.type;
+      return commandType === COMMAND_USER || commandType === COMMAND_MESSAGE ? new ContextMenuCommandInteraction(client, data) : new CommandInteraction(client, data);
+    }
+    case InteractionEnum.ApplicationCommandAutocomplete:
       return new AutocompleteInteraction(client, data);
-    case InteractionType.MessageComponent:
+    case InteractionEnum.MessageComponent:
       return new ComponentInteraction(client, data);
-    case InteractionType.ModalSubmit:
+    case InteractionEnum.ModalSubmit:
       return new ModalSubmitInteraction(client, data);
     default:
       return new Interaction(client, data);
@@ -3132,6 +3299,7 @@ function createInteraction(client, data) {
 }
 
 // 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 {
@@ -3152,6 +3320,10 @@ class Message extends BaseStructure {
   reference;
   components;
   referencedMessage;
+  stickers;
+  poll;
+  messageSnapshots;
+  member;
   #context;
   constructor(data, context) {
     super(data.id);
@@ -3172,8 +3344,20 @@ class Message extends BaseStructure {
     this.mentionEveryone = data.mention_everyone ?? false;
     this.type = data.type ?? 0;
     this.reference = data.message_reference;
+    this.stickers = data.sticker_items ?? (data.stickers ?? []).map(({ id, name, format_type }) => ({
+      id,
+      name,
+      format_type
+    }));
+    this.poll = data.poll ?? null;
+    this.messageSnapshots = data.message_snapshots ?? [];
     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() {
@@ -3214,6 +3398,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.");
@@ -3287,15 +3485,33 @@ class Message extends BaseStructure {
 }
 
 // packages/managers/src/message.ts
+function toRequest(options, allowedMentions) {
+  const { files, ...body } = options;
+  if (allowedMentions !== undefined && body.allowed_mentions === undefined)
+    body.allowed_mentions = allowedMentions;
+  if (!files?.length)
+    return body;
+  return {
+    body,
+    files: files.map((file) => ({
+      name: file.name,
+      data: typeof file.data === "string" ? new TextEncoder().encode(file.data) : file.data,
+      contentType: file.contentType
+    }))
+  };
+}
+
 class MessageManager {
   cache;
   #caching;
   #rest;
   #context;
   #channelId;
-  constructor(rest, context, channelId, cache) {
+  #allowedMentions;
+  constructor(rest, context, channelId, cache, allowedMentions) {
     if (!channelId)
       throw new TypeError("Channel ID is required.");
+    this.#allowedMentions = allowedMentions;
     this.#rest = rest;
     this.#context = context;
     this.#channelId = channelId;
@@ -3309,7 +3525,7 @@ class MessageManager {
     return this.cache.get(messageId) ?? this.fetch(messageId);
   }
   async send(options) {
-    const data = await this.#rest.post(Routes.channelMessages(this.#channelId), options);
+    const data = await this.#rest.post(Routes.channelMessages(this.#channelId), toRequest(options, this.#allowedMentions));
     return this.upsert(data);
   }
   async fetch(messageId) {
@@ -3590,14 +3806,20 @@ class MonetizationManager extends Manager {
 // packages/managers/src/member.ts
 class GuildMemberManager extends ResourceManager {
   #rest;
+  #context;
   guildId;
-  constructor(guildId, rest) {
-    super((id) => rest.get(Routes.guildMember(guildId, id)).then((data) => new GuildMember({ ...data, guild_id: guildId })), (member) => member.user.id);
+  constructor(guildId, rest, context = () => {
+    return;
+  }) {
+    super((id) => rest.get(Routes.guildMember(guildId, id)).then((data) => new GuildMember({ ...data, guild_id: guildId }, context())), (member) => member.user.id);
     this.guildId = guildId;
     this.#rest = rest;
+    this.#context = context;
   }
-  async kick(userId) {
-    await this.#rest.delete(Routes.guildMember(this.guildId, userId));
+  async kick(userId, reason) {
+    await this.#rest.delete(Routes.guildMember(this.guildId, userId), {
+      reason
+    });
     this.delete(userId);
   }
   async ban(userId, options = {}) {
@@ -3607,21 +3829,21 @@ class GuildMemberManager extends ResourceManager {
   async unban(userId) {
     await this.#rest.delete(Routes.guildBan(this.guildId, userId));
   }
-  async edit(userId, options) {
-    const data = await this.#rest.patch(Routes.guildMember(this.guildId, userId), options);
-    const member = new GuildMember({ ...data, guild_id: this.guildId });
+  async edit(userId, options, reason) {
+    const data = await this.#rest.patch(Routes.guildMember(this.guildId, userId), options, { reason });
+    const member = new GuildMember({ ...data, guild_id: this.guildId }, this.#context());
     this.set(member.user.id, member);
     return member;
   }
-  async addRole(userId, roleId) {
-    await this.#rest.put(Routes.guildMemberRole(this.guildId, userId, roleId));
+  async addRole(userId, roleId, reason) {
+    await this.#rest.put(Routes.guildMemberRole(this.guildId, userId, roleId), undefined, { reason });
   }
-  async removeRole(userId, roleId) {
-    await this.#rest.delete(Routes.guildMemberRole(this.guildId, userId, roleId));
+  async removeRole(userId, roleId, reason) {
+    await this.#rest.delete(Routes.guildMemberRole(this.guildId, userId, roleId), { reason });
   }
-  async timeout(userId, milliseconds) {
+  async timeout(userId, milliseconds, reason) {
     const timeoutDate = milliseconds === null ? null : new Date(Date.now() + milliseconds).toISOString();
-    return this.edit(userId, { communication_disabled_until: timeoutDate });
+    return this.edit(userId, { communication_disabled_until: timeoutDate }, reason);
   }
 }
 
@@ -3792,10 +4014,25 @@ class StageInstanceManager extends Manager {
 
 class PermissionOverwriteManager {
   #rest;
+  #current;
   channelId;
-  constructor(rest, channelId) {
+  constructor(rest, channelId, current = () => {
+    return;
+  }) {
     this.#rest = rest;
     this.channelId = channelId;
+    this.#current = current;
+  }
+  async update(overwriteId, changes, options = {}) {
+    const overwrites = this.#current() ?? (await this.#rest.get(Routes.channel(this.channelId))).permission_overwrites ?? [];
+    const existing = overwrites.find((entry) => entry.id === overwriteId);
+    const type = existing?.type ?? options.type;
+    if (type !== 0 && type !== 1)
+      throw new TypeError("A new permission overwrite needs a type: 0 for a role, 1 for a member.");
+    const touched = (changes.allow ?? 0n) | (changes.deny ?? 0n) | (changes.inherit ?? 0n);
+    const allow = BigInt(existing?.allow ?? 0) & ~touched | (changes.allow ?? 0n);
+    const deny = BigInt(existing?.deny ?? 0) & ~touched | (changes.deny ?? 0n);
+    await this.edit(overwriteId, { type, allow, deny }, options.reason);
   }
   async edit(overwriteId, options, reason) {
     await this.#rest.put(Routes.channelPermission(this.channelId, overwriteId), {
@@ -3827,6 +4064,10 @@ class GuildManager extends ResourceManager {
   #voiceStates = new Map;
   #autoModerationRules = new Map;
   #invites = new Map;
+  #context;
+  attachContext(context) {
+    this.#context = context;
+  }
   #perGuild(map, guildId, create) {
     let manager = map.get(guildId);
     if (!manager)
@@ -3852,7 +4093,7 @@ class GuildManager extends ResourceManager {
   members(guildId) {
     let manager = this.#members.get(guildId);
     if (!manager)
-      this.#members.set(guildId, manager = new GuildMemberManager(guildId, this.#rest));
+      this.#members.set(guildId, manager = new GuildMemberManager(guildId, this.#rest, () => this.#context));
     return manager;
   }
   roles(guildId) {
@@ -4027,10 +4268,12 @@ class ChannelManager extends Manager {
   #context;
   #messageManagers = new Map;
   #messageCache;
+  #allowedMentions;
   constructor(rest, options = {}) {
     super();
     this.#rest = rest;
     this.#messageCache = options.messageCache;
+    this.#allowedMentions = options.allowedMentions;
     this.#context = {
       sendMessage: (channelId, options) => this.send(channelId, options),
       editMessage: (channelId, messageId, options) => this.editMessage(channelId, messageId, options),
@@ -4049,13 +4292,13 @@ class ChannelManager extends Manager {
   messages(channelId) {
     let manager = this.#messageManagers.get(channelId);
     if (!manager) {
-      manager = new MessageManager(this.#rest, this.#context, channelId, this.#messageCache);
+      manager = new MessageManager(this.#rest, this.#context, channelId, this.#messageCache, this.#allowedMentions);
       this.#messageManagers.set(channelId, manager);
     }
     return manager;
   }
   permissionOverwrites(channelId) {
-    return new PermissionOverwriteManager(this.#rest, channelId);
+    return new PermissionOverwriteManager(this.#rest, channelId, () => this.get(channelId)?.permissionOverwrites);
   }
   threads(channelId) {
     return new ThreadManager(this.#rest, this.#context, channelId);
@@ -4155,7 +4398,7 @@ class ChannelManager extends Manager {
     return this.messages(data.channel_id).upsert(data);
   }
   async editMessage(channelId, messageId, options) {
-    return this.messages(channelId).upsert(await this.#rest.patch(Routes.message(channelId, messageId), options));
+    return this.messages(channelId).upsert(await this.#rest.patch(Routes.message(channelId, messageId), toRequest(options, this.#allowedMentions)));
   }
   async deleteMessage(channelId, messageId) {
     await this.#rest.delete(Routes.message(channelId, messageId));
@@ -5192,6 +5435,7 @@ class Gateway {
   #message(raw, token) {
     if (!this.#session.owns(token))
       return;
+    this.#heartbeat.receivedMessage();
     const { sequence, action } = classifyFrame(raw);
     if (sequence !== null)
       this.#session.recordSequence(sequence, token);
@@ -5460,7 +5704,8 @@ class Client extends EventEmitter2 {
     this.users = new UserManager(this.rest);
     this.guilds = new GuildManager(this.rest);
     this.channels = new ChannelManager(this.rest, {
-      messageCache: options.messageCache
+      messageCache: options.messageCache,
+      allowedMentions: options.allowedMentions
     });
     this.stageInstances = new StageInstanceManager(this.rest);
     const placeholderAppCommands = new ApplicationCommandManager(this.rest, "0");
@@ -5477,8 +5722,32 @@ class Client extends EventEmitter2 {
       removeReaction: (channelId, messageId, emoji, userId) => this.channels.removeReaction(channelId, messageId, emoji, userId),
       removeAllReactions: (channelId, messageId) => this.channels.removeAllReactions(channelId, messageId),
       pinMessage: (channelId, messageId) => this.channels.pinMessage(channelId, messageId),
-      unpinMessage: (channelId, messageId) => this.channels.unpinMessage(channelId, messageId)
+      unpinMessage: (channelId, messageId) => this.channels.unpinMessage(channelId, messageId),
+      collectInteractions: (options) => this.createCollector("interactionCreate" /* InteractionCreate */, options),
+      memberPermissions: (guildId, memberId, roleIds, channelId) => this.#memberPermissions(guildId, memberId, roleIds, channelId),
+      kickMember: (guildId, userId, reason) => this.guilds.members(guildId).kick(userId, reason),
+      banMember: (guildId, userId, options) => this.guilds.members(guildId).ban(userId, options),
+      editMember: (guildId, userId, options, reason) => this.guilds.members(guildId).edit(userId, options, reason),
+      addMemberRole: (guildId, userId, roleId, reason) => this.guilds.members(guildId).addRole(userId, roleId, reason),
+      removeMemberRole: (guildId, userId, roleId, reason) => this.guilds.members(guildId).removeRole(userId, roleId, reason),
+      editPermissionOverwrite: async (channelId, targetId, changes, options) => {
+        const bits = { allow: 0n, deny: 0n, inherit: 0n };
+        for (const [name, value] of Object.entries(changes)) {
+          if (!/^[A-Za-z]+$/.test(name))
+            throw new TypeError(`Unknown permission: ${name}`);
+          let bit;
+          try {
+            bit = new PermissionSet(name).bitfield;
+          } catch {
+            throw new TypeError(`Unknown permission: ${name}`);
+          }
+          const key = value === true ? "allow" : value === false ? "deny" : "inherit";
+          bits[key] |= bit;
+        }
+        return this.channels.permissionOverwrites(channelId).update(targetId, bits, options);
+      }
     };
+    this.guilds.attachContext(this.#resourceContext);
     this.#gateway = new Gateway({
       token: options.token,
       intents: options.intents,
@@ -5510,8 +5779,14 @@ class Client extends EventEmitter2 {
       this.emit("close" /* Close */, data);
     });
     this.#gateway.on("MESSAGE_CREATE", (data) => {
-      const message = new Message(data, this.#resourceContext);
+      const payload = data;
+      const message = new Message(payload, this.#resourceContext);
       this.#observeMessage(message);
+      if (payload.member && payload.guild_id && this.guilds.has(payload.guild_id))
+        this.#upsertMember(payload.guild_id, {
+          ...payload.member,
+          user: payload.member.user ?? payload.author
+        });
       const cached = this.options.messageCache ? this.channels.messages(message.channelId).upsert(data) : message;
       this.emit("messageCreate" /* MessageCreate */, cached);
     });
@@ -5577,8 +5852,11 @@ class Client extends EventEmitter2 {
       this.emit(wasCached ? "guildAvailable" /* GuildAvailable */ : "guildCreate" /* GuildCreate */, payload);
     });
     this.#gateway.on("GUILD_UPDATE", (data) => {
-      this.guilds.patch(data);
-      this.emit("guildUpdate" /* GuildUpdate */, data);
+      const payload = data;
+      const cached = this.guilds.get(payload.id);
+      const previous = cached ? this.#snapshot(cached) : null;
+      this.guilds.patch(payload);
+      this.emit("guildUpdate" /* GuildUpdate */, payload, previous);
     });
     this.#gateway.on("GUILD_DELETE", (data) => {
       const payload = data;
@@ -5597,8 +5875,10 @@ class Client extends EventEmitter2 {
     });
     this.#gateway.on("GUILD_MEMBER_UPDATE", (data) => {
       const member = data;
+      const cached = this.#cache.members ? this.guilds.members(member.guild_id).get(member.user.id) : undefined;
+      const previous = cached ? this.#snapshot(cached, new GuildMember({ user: member.user, guild_id: member.guild_id }, this.#resourceContext)) : null;
       this.#upsertMember(member.guild_id, member);
-      this.emit("guildMemberUpdate" /* GuildMemberUpdate */, member);
+      this.emit("guildMemberUpdate" /* GuildMemberUpdate */, member, previous);
     });
     this.#gateway.on("GUILD_MEMBER_REMOVE", (data) => {
       const member = data;
@@ -5633,18 +5913,24 @@ class Client extends EventEmitter2 {
     });
     this.#gateway.on("GUILD_ROLE_UPDATE", (data) => {
       const event = data;
+      const cached = this.#cache.roles ? this.guilds.roles(event.guild_id).get(event.role.id) : undefined;
+      const previous = cached ? this.#snapshot(cached) : null;
       this.#upsertRole(event.guild_id, event.role);
-      this.emit("guildRoleUpdate" /* GuildRoleUpdate */, event);
+      this.emit("guildRoleUpdate" /* GuildRoleUpdate */, event, previous);
     });
     this.#gateway.on("GUILD_ROLE_DELETE", (data) => {
       const event = data;
-      this.guilds.roles(event.guild_id).delete(event.role_id);
-      this.emit("guildRoleDelete" /* GuildRoleDelete */, event);
+      const roles = this.guilds.roles(event.guild_id);
+      const removed = roles.get(event.role_id) ?? null;
+      roles.delete(event.role_id);
+      this.emit("guildRoleDelete" /* GuildRoleDelete */, event, removed);
     });
     this.#gateway.on("GUILD_EMOJIS_UPDATE", (data) => {
       const event = data;
+      let previous = null;
       if (this.#cache.emojis) {
         const emojis = this.guilds.emojis(event.guild_id);
+        previous = [...emojis.cache.values()].map((emoji) => this.#snapshot(emoji));
         const current = new Set(event.emojis.map((emoji) => emoji.id));
         for (const id of [...emojis.cache.keys()])
           if (!current.has(id))
@@ -5652,12 +5938,14 @@ class Client extends EventEmitter2 {
         for (const emoji of event.emojis)
           emojis.upsert(emoji);
       }
-      this.emit("guildEmojisUpdate" /* GuildEmojisUpdate */, event);
+      this.emit("guildEmojisUpdate" /* GuildEmojisUpdate */, event, previous);
     });
     this.#gateway.on("GUILD_STICKERS_UPDATE", (data) => {
       const event = data;
-      this.guilds.stickers(event.guild_id).sync(event.stickers);
-      this.emit("guildStickersUpdate" /* GuildStickersUpdate */, event);
+      const stickers = this.guilds.stickers(event.guild_id);
+      const previous = [...stickers.cache.values()];
+      stickers.sync(event.stickers);
+      this.emit("guildStickersUpdate" /* GuildStickersUpdate */, event, previous);
     });
     this.#gateway.on("GUILD_SOUNDBOARD_SOUND_CREATE", (data) => {
       const sound = data;
@@ -5738,13 +6026,15 @@ class Client extends EventEmitter2 {
       this.emit("channelCreate" /* ChannelCreate */, channel);
     });
     this.#gateway.on("CHANNEL_UPDATE", (data) => {
+      const previous = this.#previousChannel(data);
       const channel = this.channels.upsert(data);
-      this.emit("channelUpdate" /* ChannelUpdate */, channel);
+      this.emit("channelUpdate" /* ChannelUpdate */, channel, previous);
     });
     this.#gateway.on("CHANNEL_DELETE", (data) => {
       const payload = data;
+      const removed = this.channels.get(payload.id) ?? null;
       this.channels.delete(payload.id);
-      this.emit("channelDelete" /* ChannelDelete */, payload);
+      this.emit("channelDelete" /* ChannelDelete */, payload, removed);
     });
     this.#gateway.on("CHANNEL_PINS_UPDATE", (data) => this.emit("channelPinsUpdate" /* ChannelPinsUpdate */, data));
     this.#gateway.on("THREAD_CREATE", (data) => {
@@ -5752,13 +6042,15 @@ class Client extends EventEmitter2 {
       this.emit("threadCreate" /* ThreadCreate */, channel);
     });
     this.#gateway.on("THREAD_UPDATE", (data) => {
+      const previous = this.#previousChannel(data);
       const channel = this.channels.upsert(data);
-      this.emit("threadUpdate" /* ThreadUpdate */, channel);
+      this.emit("threadUpdate" /* ThreadUpdate */, channel, previous);
     });
     this.#gateway.on("THREAD_DELETE", (data) => {
       const payload = data;
+      const removed = this.channels.get(payload.id) ?? null;
       this.channels.delete(payload.id);
-      this.emit("threadDelete" /* ThreadDelete */, payload);
+      this.emit("threadDelete" /* ThreadDelete */, payload, removed);
     });
     this.#gateway.on("THREAD_LIST_SYNC", (data) => {
       const sync = data;
@@ -5816,7 +6108,7 @@ class Client extends EventEmitter2 {
       this.#merge(this.users, message.author.id, message.author);
   }
   #upsertMember(guildId, data) {
-    const member = new GuildMember({ ...data, guild_id: guildId });
+    const member = new GuildMember({ ...data, guild_id: guildId }, this.#resourceContext);
     if (this.#cache.users)
       this.#merge(this.users, member.user.id, member.user);
     if (!this.#cache.members)
@@ -5835,6 +6127,15 @@ class Client extends EventEmitter2 {
       return new Role(data);
     return this.#merge(this.guilds.roles(guildId), data.id, new Role(data));
   }
+  #snapshot(cached, blank = Object.create(Object.getPrototypeOf(cached))) {
+    return Object.assign(blank, cached);
+  }
+  #previousChannel(data) {
+    const cached = this.channels.get(data.id);
+    if (!cached)
+      return null;
+    return this.#snapshot(cached, createChannel({ id: cached.id, type: cached.type, guild_id: cached.guildId }, this.#resourceContext));
+  }
   #merge(manager, id, next) {
     const existing = manager.get(id);
     if (!existing) {
@@ -5859,6 +6160,29 @@ class Client extends EventEmitter2 {
     collector.onDispose(() => this.off(event, listener));
     return collector;
   }
+  get resourceContext() {
+    return this.#resourceContext;
+  }
+  #memberPermissions(guildId, memberId, roleIds, channelId) {
+    const guild = this.guilds.get(guildId);
+    if (!guild)
+      return null;
+    let channel = channelId ? this.channels.get(channelId) : undefined;
+    if (channelId) {
+      if (channel?.isThread())
+        channel = channel.parentId ? this.channels.get(channel.parentId) : undefined;
+      if (!channel || channel.guildId !== guildId)
+        return null;
+    }
+    return computePermissions({
+      guildId,
+      ownerId: guild.ownerId,
+      memberId,
+      memberRoleIds: [...roleIds],
+      roles: this.guilds.roles(guildId).values(),
+      overwrites: channel?.permissionOverwrites
+    });
+  }
   permissionsFor(memberId, guildOrChannelId) {
     let channel = this.channels.get(guildOrChannelId);
     if (channel?.isThread()) {
@@ -5902,12 +6226,23 @@ class Client extends EventEmitter2 {
     this.#gateway.close();
   }
   postInteractionResponse(id, token, response) {
-    return this.rest.post(Routes.interactionCallback(id, token), response.toJSON());
+    const json = response.toJSON();
+    const callback = response.withResponse ? `${Routes.interactionCallback(id, token)}?with_response=true` : Routes.interactionCallback(id, token);
+    const carriesMessage = json.type === 4 || json.type === 7;
+    const upload = json.data ? toRequest(json.data, carriesMessage ? this.options.allowedMentions : undefined) : undefined;
+    if (upload && typeof upload === "object" && "files" in upload) {
+      const { body, files } = upload;
+      return this.rest.post(callback, {
+        body: { ...json, data: body },
+        files
+      });
+    }
+    return this.rest.post(callback, upload === undefined ? json : { ...json, data: upload });
   }
   editInteractionReply(token, data) {
     if (!this.user)
       return Promise.reject(new Error("Client is unauthenticated."));
-    return this.rest.patch(Routes.interactionOriginalResponse(this.user.id, token), data);
+    return this.rest.patch(Routes.interactionOriginalResponse(this.user.id, token), toRequest(data, this.options.allowedMentions));
   }
   deleteInteractionReply(token) {
     if (!this.user)
@@ -5917,14 +6252,14 @@ class Client extends EventEmitter2 {
   followUpInteraction(token, data) {
     if (!this.user)
       return Promise.reject(new Error("Client is unauthenticated."));
-    return this.rest.post(`/webhooks/${this.user.id}/${token}`, data);
+    return this.rest.post(`/webhooks/${this.user.id}/${token}`, toRequest(data, this.options.allowedMentions));
   }
   interactionWebhookMessage(method, applicationId, token, messageId, data) {
     const path = messageId === "@original" ? Routes.interactionOriginalResponse(applicationId, token) : Routes.webhookMessage(applicationId, token, messageId);
     if (method === "GET")
       return this.rest.get(path);
     if (method === "PATCH")
-      return this.rest.patch(path, data);
+      return this.rest.patch(path, data ? toRequest(data, this.options.allowedMentions) : data);
     return this.rest.delete(path);
   }
   fetchWebhook(id, token) {
@@ -5980,6 +6315,7 @@ export {
   IntentsBitField,
   Permission,
   PermissionFlagsBits,
+  PermissionOverwriteEnum,
   PermissionOverwriteType,
   PermissionSet,
   Permissions,
@@ -5988,4 +6324,4 @@ export {
   resolveGatewayIntents
 };
 
-//# debugId=29BD1D4A42C8D39264756E2164756E21
+//# debugId=A5606C420611230B64756E2164756E21