@fluxerjs/core 1.2.1 → 1.2.3

package/dist/index.js

@@ -50,16 +50,16 @@ __export(index_exports, {
   MessageManager: () => MessageManager,
   MessagePayload: () => import_builders3.MessagePayload,
   MessageReaction: () => MessageReaction,
-  PermissionFlags: () => import_util9.PermissionFlags,
-  PermissionsBitField: () => import_util9.PermissionsBitField,
+  PermissionFlags: () => import_util10.PermissionFlags,
+  PermissionsBitField: () => import_util10.PermissionsBitField,
   ReactionCollector: () => ReactionCollector,
   Role: () => Role,
   Routes: () => import_types22.Routes,
   STATIC_CDN_URL: () => STATIC_CDN_URL,
   TextChannel: () => TextChannel,
   User: () => User,
-  UserFlagsBitField: () => import_util9.UserFlagsBitField,
-  UserFlagsBits: () => import_util9.UserFlagsBits,
+  UserFlagsBitField: () => import_util10.UserFlagsBitField,
+  UserFlagsBits: () => import_util10.UserFlagsBits,
   UsersManager: () => UsersManager,
   VoiceChannel: () => VoiceChannel,
   Webhook: () => Webhook,
@@ -69,10 +69,10 @@ __export(index_exports, {
   cdnDisplayAvatarURL: () => cdnDisplayAvatarURL,
   cdnMemberAvatarURL: () => cdnMemberAvatarURL,
   cdnMemberBannerURL: () => cdnMemberBannerURL,
-  parsePrefixCommand: () => import_util8.parsePrefixCommand,
-  parseUserMention: () => import_util8.parseUserMention,
-  resolvePermissionsToBitfield: () => import_util9.resolvePermissionsToBitfield,
-  resolveTenorToImageUrl: () => import_util8.resolveTenorToImageUrl
+  parsePrefixCommand: () => import_util9.parsePrefixCommand,
+  parseUserMention: () => import_util9.parseUserMention,
+  resolvePermissionsToBitfield: () => import_util10.resolvePermissionsToBitfield,
+  resolveTenorToImageUrl: () => import_util9.resolveTenorToImageUrl
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -85,7 +85,7 @@ var import_types21 = require("@fluxerjs/types");
 // src/client/ChannelManager.ts
 var import_collection4 = require("@fluxerjs/collection");
 var import_types6 = require("@fluxerjs/types");
-var import_util2 = require("@fluxerjs/util");
+var import_util3 = require("@fluxerjs/util");
 var import_rest2 = require("@fluxerjs/rest");
 
 // src/errors/FluxerError.ts
@@ -162,6 +162,7 @@ function buildSendBody(options) {
       filename: f.filename ?? f.name
     }));
   }
+  if (body.flags !== void 0) result.flags = body.flags;
   return result;
 }
 
@@ -313,7 +314,10 @@ var Message = class _Message extends Base {
   mentionRoles;
   /** Client-side nonce for acknowledgment. Null if not provided. */
   nonce;
-  /** Channel where this message was sent. Resolved from cache; null if not cached (e.g. DM channel not in cache). */
+  /**
+   * Channel where this message was sent. Resolved from cache; null if not cached.
+   * Messages can only exist in text-based channels (text, DM, announcement), so this always has send() when non-null.
+   */
   get channel() {
     return this.client.channels.get(this.channelId) ?? null;
   }
@@ -375,12 +379,8 @@ var Message = class _Message extends Base {
    * await message.send({ content: 'File', files: [{ name: 'data.txt', data }] });
    */
   async send(options) {
-    const opts = typeof options === "string" ? { content: options } : options;
-    const body = buildSendBody(options);
-    const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
-    const postOptions = files?.length ? { body, files } : { body };
-    const data = await this.client.rest.post(import_types.Routes.channelMessages(this.channelId), postOptions);
-    return new _Message(this.client, data);
+    const payload = await _Message._createMessageBody(options);
+    return this._send(payload);
   }
   /**
    * Send a message to a specific channel. Use for logging, forwarding, or sending to another channel in the guild.
@@ -395,25 +395,46 @@ var Message = class _Message extends Base {
   }
   /**
    * Reply to this message (shows as a reply in the client).
-   * @param options - Text content or object with content, embeds, and/or files
+   * @param options - Text content or object with content, embeds, and/or reply options (ping, replyTo)
    * @example
    * await message.reply('Pong!');
    * await message.reply({ embeds: [embed] });
+   * await message.reply('No ping!', { ping: false });
+   * await message.reply({ content: 'Reply to other', replyTo: otherMessage });
    */
-  async reply(options) {
+  async reply(options, replyOptions) {
     const opts = typeof options === "string" ? { content: options } : options;
-    const base = buildSendBody(options);
-    const body = {
-      ...base,
-      message_reference: {
-        channel_id: this.channelId,
-        message_id: this.id,
-        guild_id: this.guildId ?? void 0
+    const mergedReply = replyOptions ?? (opts.ping !== void 0 || opts.replyTo !== void 0) ? { ping: opts.ping, replyTo: opts.replyTo } : void 0;
+    const refMessage = mergedReply?.replyTo ?? this;
+    const ref = refMessage instanceof _Message ? { channel_id: refMessage.channelId, message_id: refMessage.id, guild_id: refMessage.guildId ?? void 0 } : { channel_id: refMessage.channelId, message_id: refMessage.messageId, guild_id: void 0 };
+    const payload = await _Message._createMessageBody(opts, ref, mergedReply?.ping !== false);
+    return this._send(payload);
+  }
+  /** Exposed for testing purposes, use Message.reply() or send() for normal use */
+  static async _createMessageBody(content, referenced_message, ping) {
+    if (typeof content === "string") {
+      if (content.length === 0) {
+        throw new RangeError("Cannot send an empty message");
       }
-    };
-    const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
-    const postOptions = files?.length ? { body, files } : { body };
-    const data = await this.client.rest.post(import_types.Routes.channelMessages(this.channelId), postOptions);
+      content = { content };
+    }
+    const base = buildSendBody(content);
+    const files = content.files?.length ? await resolveMessageFiles(content.files) : void 0;
+    const body = { ...base };
+    if (referenced_message) {
+      body.message_reference = referenced_message;
+      if (ping === false) {
+        body.flags = (body.flags ?? 0) | import_types.MessageFlags.SuppressNotifications;
+      }
+    }
+    return { files, body };
+  }
+  async _send(payload) {
+    const data = await this.client.rest.post(
+      import_types.Routes.channelMessages(this.channelId),
+      payload
+    );
+    this.client._addMessageToCache(this.channelId, data);
     return new _Message(this.client, data);
   }
   /**
@@ -550,8 +571,18 @@ var MessageManager = class {
     this.client = client;
     this.channelId = channelId;
   }
+  /**
+   * Get a message from cache. Returns undefined if not cached or caching is disabled.
+   * Requires options.cache.messages > 0.
+   * @param messageId - Snowflake of the message
+   */
+  get(messageId) {
+    const data = this.client._getMessageCache(this.channelId)?.get(messageId);
+    return data ? new Message(this.client, data) : void 0;
+  }
   /**
    * Fetch a message by ID from this channel.
+   * When message caching is enabled, the fetched message is added to the cache.
    * @param messageId - Snowflake of the message
    * @returns The message
    * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
@@ -561,6 +592,7 @@ var MessageManager = class {
       const data = await this.client.rest.get(
         import_types2.Routes.channelMessage(this.channelId, messageId)
       );
+      this.client._addMessageToCache(this.channelId, data);
       return new Message(this.client, data);
     } catch (err) {
       if (err instanceof import_rest.RateLimitError) throw err;
@@ -630,6 +662,7 @@ var MessageCollector = class extends import_events2.EventEmitter {
 // src/structures/Channel.ts
 var import_types5 = require("@fluxerjs/types");
 var import_util = require("@fluxerjs/util");
+var import_util2 = require("@fluxerjs/util");
 
 // src/structures/Webhook.ts
 var import_types3 = require("@fluxerjs/types");
@@ -764,7 +797,7 @@ var Webhook = class _Webhook extends Base {
       );
     }
     const opts = typeof options === "string" ? { content: options } : options;
-    const body = buildSendBody(options);
+    const body = buildSendBody(opts);
     if (opts.username !== void 0) body.username = opts.username;
     if (opts.avatar_url !== void 0) body.avatar_url = opts.avatar_url;
     if (opts.tts !== void 0) body.tts = opts.tts;
@@ -865,7 +898,7 @@ var Invite = class extends Base {
 // src/structures/Channel.ts
 var Channel = class _Channel extends Base {
   /** Whether this channel has a send method (TextChannel, DMChannel). */
-  isSendable() {
+  isTextBased() {
     return "send" in this;
   }
   /** Whether this channel is a DM or Group DM. */
@@ -876,6 +909,9 @@ var Channel = class _Channel extends Base {
   isVoice() {
     return "bitrate" in this;
   }
+  isLink() {
+    return "url" in this;
+  }
   /** Create a DM channel from API data (type DM or GroupDM). */
   static createDM(client, data) {
     return new DMChannel(client, data);
@@ -939,6 +975,15 @@ var Channel = class _Channel extends Base {
   async sendTyping() {
     await this.client.rest.post(import_types5.Routes.channelTyping(this.id), { auth: true });
   }
+  /**
+   * Whether the bot can send messages in this channel.
+   * For DMs: always true (when the channel exists).
+   * For guild channels: checks ViewChannel and SendMessages permissions via guild.members.me.
+   */
+  canSendMessage() {
+    if (this.isDM()) return true;
+    return false;
+  }
 };
 var GuildChannel = class extends Channel {
   guildId;
@@ -1022,6 +1067,32 @@ var GuildChannel = class extends Channel {
     if (idx >= 0) this.permissionOverwrites[idx] = entry;
     else this.permissionOverwrites.push(entry);
   }
+  /**
+   * Whether the bot can send messages in this channel.
+   * Checks ViewChannel and SendMessages via guild.members.me permissions.
+   * Returns false if guild or bot member not cached.
+   */
+  canSendMessage() {
+    const guild = this.client.guilds.get(this.guildId);
+    if (!guild) return false;
+    const me = guild.members.me;
+    if (!me) return false;
+    const perms = me.permissionsIn(this);
+    return perms.has(import_util.PermissionFlags.ViewChannel) && perms.has(import_util.PermissionFlags.SendMessages);
+  }
+  /**
+   * Send a message to this guild channel.
+   * Works for text and announcement channels. Voice/category/link channels will fail at the API.
+   */
+  async send(options) {
+    const opts = typeof options === "string" ? { content: options } : options;
+    const body = buildSendBody(options);
+    const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
+    const postOptions = files?.length ? { body, files } : { body };
+    const data = await this.client.rest.post(import_types5.Routes.channelMessages(this.id), postOptions);
+    this.client._addMessageToCache(this.id, data);
+    return new Message(this.client, data);
+  }
   /**
    * Remove a permission overwrite. DELETE /channels/{id}/permissions/{overwriteId}.
    */
@@ -1085,6 +1156,7 @@ var TextChannel = class extends GuildChannel {
     const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
     const postOptions = files?.length ? { body, files } : { body };
     const data = await this.client.rest.post(import_types5.Routes.channelMessages(this.id), postOptions);
+    this.client._addMessageToCache(this.id, data);
     return new Message(this.client, data);
   }
   /** Message manager for this channel. Use channel.messages.fetch(messageId). */
@@ -1122,7 +1194,7 @@ var TextChannel = class extends GuildChannel {
    * @deprecated Use channel.messages.fetch(messageId) instead.
    */
   async fetchMessage(messageId) {
-    (0, import_util.emitDeprecationWarning)(
+    (0, import_util2.emitDeprecationWarning)(
       "Channel.fetchMessage()",
       "Use channel.messages.fetch(messageId) instead."
     );
@@ -1176,6 +1248,7 @@ var DMChannel = class extends Channel {
     const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
     const postOptions = files?.length ? { body, files } : { body };
     const data = await this.client.rest.post(import_types5.Routes.channelMessages(this.id), postOptions);
+    this.client._addMessageToCache(this.id, data);
     return new Message(this.client, data);
   }
   /** Message manager for this channel. Use channel.messages.fetch(messageId). */
@@ -1208,7 +1281,7 @@ var DMChannel = class extends Channel {
    * @deprecated Use channel.messages.fetch(messageId) instead.
    */
   async fetchMessage(messageId) {
-    (0, import_util.emitDeprecationWarning)(
+    (0, import_util2.emitDeprecationWarning)(
       "Channel.fetchMessage()",
       "Use channel.messages.fetch(messageId) instead."
     );
@@ -1259,7 +1332,7 @@ var ChannelManager = class extends import_collection4.Collection {
    * @throws FluxerError with CHANNEL_NOT_FOUND if the channel does not exist
    * @example
    * const channel = await client.channels.resolve(message.channelId);
-   * if (channel?.isSendable()) await channel.send('Hello!');
+   * if (channel?.isTextBased()) await channel.send('Hello!');
    */
   async resolve(channelId) {
     return this.get(channelId) ?? this.fetch(channelId);
@@ -1271,7 +1344,7 @@ var ChannelManager = class extends import_collection4.Collection {
    * @throws FluxerError with CHANNEL_NOT_FOUND if the channel does not exist
    * @example
    * const channel = await client.channels.fetch(channelId);
-   * if (channel?.isSendable()) await channel.send('Hello!');
+   * if (channel?.isTextBased()) await channel.send('Hello!');
    */
   async fetch(channelId) {
     const cached = this.get(channelId);
@@ -1313,7 +1386,7 @@ var ChannelManager = class extends import_collection4.Collection {
    * const message = await channel?.messages?.fetch(messageId);
    */
   async fetchMessage(channelId, messageId) {
-    (0, import_util2.emitDeprecationWarning)(
+    (0, import_util3.emitDeprecationWarning)(
       "ChannelManager.fetchMessage()",
       "Use channel.messages.fetch(messageId). Prefer (await client.channels.resolve(channelId))?.messages?.fetch(messageId)."
     );
@@ -1350,6 +1423,7 @@ var ChannelManager = class extends import_collection4.Collection {
     const files = opts.files?.length ? await resolveMessageFiles(opts.files) : void 0;
     const postOptions = files?.length ? { body, files } : { body };
     const data = await this.client.rest.post(import_types6.Routes.channelMessages(channelId), postOptions);
+    this.client._addMessageToCache(channelId, data);
     return new Message(this.client, data);
   }
 };
@@ -1359,7 +1433,7 @@ var import_collection8 = require("@fluxerjs/collection");
 var import_types16 = require("@fluxerjs/types");
 
 // src/structures/Guild.ts
-var import_util6 = require("@fluxerjs/util");
+var import_util7 = require("@fluxerjs/util");
 var import_rest3 = require("@fluxerjs/rest");
 var import_collection7 = require("@fluxerjs/collection");
 
@@ -1368,14 +1442,14 @@ var import_collection6 = require("@fluxerjs/collection");
 var import_types10 = require("@fluxerjs/types");
 
 // src/structures/GuildMember.ts
-var import_util4 = require("@fluxerjs/util");
+var import_util5 = require("@fluxerjs/util");
 var import_types9 = require("@fluxerjs/types");
 
 // src/util/permissions.ts
 var import_types7 = require("@fluxerjs/types");
-var import_util3 = require("@fluxerjs/util");
+var import_util4 = require("@fluxerjs/util");
 function computePermissions(basePermissions, overwrites, memberRoles, memberId, isOwner) {
-  if (isOwner) return import_util3.ALL_PERMISSIONS_BIGINT;
+  if (isOwner) return import_util4.ALL_PERMISSIONS_BIGINT;
   let perms = basePermissions;
   for (const overwrite of overwrites ?? []) {
     const applies = overwrite.type === import_types7.OverwriteType.Role && memberRoles.includes(overwrite.id) || overwrite.type === import_types7.OverwriteType.Member && overwrite.id === memberId;
@@ -1384,12 +1458,7 @@ function computePermissions(basePermissions, overwrites, memberRoles, memberId,
     const deny = BigInt(overwrite.deny || "0");
     perms = perms & ~deny | allow;
   }
-  return perms;
-}
-function hasPermission(bitfield, permission) {
-  const Administrator = 1n << 3n;
-  if ((bitfield & Administrator) !== 0n) return true;
-  return (bitfield & permission) === permission;
+  return (perms & import_util4.PermissionFlags.Administrator) !== 0n ? import_util4.ALL_PERMISSIONS_BIGINT : perms;
 }
 
 // src/structures/GuildMemberRoleManager.ts
@@ -1591,13 +1660,7 @@ var GuildMember = class extends Base {
     const ownerId = this.guild.ownerId;
     const isOwner = ownerId != null && ownerId !== "" && String(ownerId) === String(this.id);
     const perms = computePermissions(base, [], [], this.id, isOwner);
-    return {
-      has(permission) {
-        const perm = typeof permission === "number" ? permission : import_util4.PermissionFlagsMap[String(permission)];
-        if (perm === void 0) return false;
-        return hasPermission(perms, BigInt(perm));
-      }
-    };
+    return new import_util5.BitField(perms);
   }
   /**
    * Compute the member's effective permissions in a guild channel.
@@ -1619,22 +1682,16 @@ var GuildMember = class extends Base {
       this.id,
       isOwner
     );
-    return {
-      has(permission) {
-        const perm = typeof permission === "number" ? permission : import_util4.PermissionFlagsMap[String(permission)];
-        if (perm === void 0) return false;
-        return hasPermission(perms, BigInt(perm));
-      }
-    };
+    return new import_util5.BitField(perms);
   }
   _computeBasePermissions() {
     let base = 0n;
     const everyone = this.guild.roles.get(this.guild.id);
-    if (everyone) base |= BigInt(everyone.permissions);
+    if (everyone) base |= everyone.permissions.bitfield;
     for (const roleId of this.roles.roleIds) {
       if (roleId === this.guild.id) continue;
       const role = this.guild.roles.get(roleId);
-      if (role) base |= BigInt(role.permissions);
+      if (role) base |= role.permissions.bitfield;
     }
     return base;
   }
@@ -1718,7 +1775,7 @@ var GuildMemberManager = class extends import_collection6.Collection {
 
 // src/structures/Role.ts
 var import_types11 = require("@fluxerjs/types");
-var import_util5 = require("@fluxerjs/util");
+var import_util6 = require("@fluxerjs/util");
 var Role = class extends Base {
   client;
   id;
@@ -1726,7 +1783,7 @@ var Role = class extends Base {
   name;
   color;
   position;
-  permissions;
+  _permissions;
   hoist;
   mentionable;
   unicodeEmoji;
@@ -1743,18 +1800,24 @@ var Role = class extends Base {
     this.name = data.name;
     this.color = data.color;
     this.position = data.position;
-    this.permissions = data.permissions;
+    this._permissions = data.permissions;
     this.hoist = !!data.hoist;
     this.mentionable = !!data.mentionable;
     this.unicodeEmoji = data.unicode_emoji ?? null;
     this.hoistPosition = data.hoist_position ?? null;
   }
+  get permissions() {
+    const bits = BigInt(this._permissions);
+    return new import_util6.PermissionsBitField(
+      (bits & import_util6.PermissionFlags.Administrator) !== 0n ? import_util6.ALL_PERMISSIONS_BIGINT : bits
+    );
+  }
   /** Update mutable fields from fresh API data. Used by edit and gateway events. */
   _patch(data) {
     if (data.name !== void 0) this.name = data.name;
     if (data.color !== void 0) this.color = data.color;
     if (data.position !== void 0) this.position = data.position;
-    if (data.permissions !== void 0) this.permissions = data.permissions;
+    if (data.permissions !== void 0) this._permissions = data.permissions;
     if (data.hoist !== void 0) this.hoist = !!data.hoist;
     if (data.mentionable !== void 0) this.mentionable = !!data.mentionable;
     if (data.unicode_emoji !== void 0) this.unicodeEmoji = data.unicode_emoji ?? null;
@@ -1764,24 +1827,6 @@ var Role = class extends Base {
   toString() {
     return `<@&${this.id}>`;
   }
-  /**
-   * Check if this role has a permission. Administrator grants all permissions.
-   * @param permission - Permission flag, name, or resolvable
-   * @returns true if the role has the permission
-   * @example
-   * if (role.has(PermissionFlags.BanMembers)) { ... }
-   * if (role.has('ManageChannels')) { ... }
-   */
-  has(permission) {
-    const perm = typeof permission === "number" ? permission : import_util5.PermissionFlags[permission];
-    if (perm === void 0) return false;
-    const permNum = Number(perm);
-    const rolePerms = BigInt(this.permissions);
-    const permBig = BigInt(permNum);
-    if (permBig < 0) return false;
-    if ((rolePerms & BigInt(import_util5.PermissionFlags.Administrator)) !== 0n) return true;
-    return (rolePerms & permBig) === permBig;
-  }
   /**
    * Edit this role.
    * Requires Manage Roles permission.
@@ -1794,7 +1839,7 @@ var Role = class extends Base {
     const body = {};
     if (options.name !== void 0) body.name = options.name;
     if (options.permissions !== void 0) {
-      body.permissions = typeof options.permissions === "string" ? options.permissions : (0, import_util5.resolvePermissionsToBitfield)(options.permissions);
+      body.permissions = typeof options.permissions === "string" ? options.permissions : (0, import_util6.resolvePermissionsToBitfield)(options.permissions);
     }
     if (options.color !== void 0) body.color = options.color;
     if (options.hoist !== void 0) body.hoist = options.hoist;
@@ -2065,7 +2110,7 @@ var Guild = class extends Base {
     const body = {};
     if (options.name !== void 0) body.name = options.name;
     if (options.permissions !== void 0) {
-      body.permissions = typeof options.permissions === "string" ? options.permissions : (0, import_util6.resolvePermissionsToBitfield)(options.permissions);
+      body.permissions = typeof options.permissions === "string" ? options.permissions : (0, import_util7.resolvePermissionsToBitfield)(options.permissions);
     }
     if (options.color !== void 0) body.color = options.color;
     if (options.hoist !== void 0) body.hoist = options.hoist;
@@ -2128,7 +2173,7 @@ var Guild = class extends Base {
    * @returns The role ID, or null if not found
    */
   async resolveRoleId(arg) {
-    const parsed = (0, import_util6.parseRoleMention)(arg);
+    const parsed = (0, import_util7.parseRoleMention)(arg);
     if (parsed) return parsed;
     if (/^\d{17,19}$/.test(arg.trim())) return arg.trim();
     const cached = this.roles.find(
@@ -2665,7 +2710,7 @@ var ClientUser = class extends User {
 };
 
 // src/client/Client.ts
-var import_util7 = require("@fluxerjs/util");
+var import_util8 = require("@fluxerjs/util");
 
 // src/client/UsersManager.ts
 var import_collection9 = require("@fluxerjs/collection");
@@ -2821,13 +2866,28 @@ handlers.set("MESSAGE_CREATE", async (client, d) => {
       guild.members.set(member.id, member);
     }
   }
+  client._addMessageToCache(data.channel_id, data);
   client.emit(Events.MessageCreate, new Message(client, data));
 });
 handlers.set("MESSAGE_UPDATE", async (client, d) => {
-  client.emit(Events.MessageUpdate, null, new Message(client, d));
+  const partial = d;
+  const cache = client._getMessageCache(partial.channel_id);
+  let oldMessage = null;
+  let mergedData = partial;
+  if (cache) {
+    const oldData = cache.get(partial.id);
+    if (oldData) {
+      oldMessage = new Message(client, oldData);
+      mergedData = { ...oldData, ...partial };
+    }
+    cache.set(partial.id, mergedData);
+  }
+  const newMessage = new Message(client, mergedData);
+  client.emit(Events.MessageUpdate, oldMessage, newMessage);
 });
 handlers.set("MESSAGE_DELETE", async (client, d) => {
   const data = d;
+  client._removeMessageFromCache(data.channel_id, data.id);
   const channel = client.channels.get(data.channel_id) ?? null;
   client.emit(Events.MessageDelete, {
     id: data.id,
@@ -2890,6 +2950,7 @@ handlers.set("GUILD_CREATE", async (client, d) => {
   if (g.voice_states?.length) {
     client.emit(Events.VoiceStatesSync, { guildId: guild.id, voiceStates: g.voice_states });
   }
+  client._onGuildReceived(guild.id);
 });
 handlers.set("GUILD_UPDATE", async (client, d) => {
   const guildData = normalizeGuildPayload(d);
@@ -2996,7 +3057,11 @@ handlers.set("VOICE_SERVER_UPDATE", async (client, d) => {
   client.emit(Events.VoiceServerUpdate, d);
 });
 handlers.set("MESSAGE_DELETE_BULK", async (client, d) => {
-  client.emit(Events.MessageDeleteBulk, d);
+  const data = d;
+  for (const id of data.ids ?? []) {
+    client._removeMessageFromCache(data.channel_id, id);
+  }
+  client.emit(Events.MessageDeleteBulk, data);
 });
 handlers.set("GUILD_BAN_ADD", async (client, d) => {
   const data = d;
@@ -3022,7 +3087,11 @@ handlers.set("GUILD_EMOJIS_UPDATE", async (client, d) => {
       if (!e.id || e.name == null) continue;
       guild.emojis.set(
         e.id,
-        new GuildEmoji(client, { id: e.id, name: e.name, animated: e.animated ?? false, guild_id: guild.id }, guild.id)
+        new GuildEmoji(
+          client,
+          { id: e.id, name: e.name, animated: e.animated ?? false, guild_id: guild.id },
+          guild.id
+        )
       );
     }
   }
@@ -3148,6 +3217,10 @@ var Client = class extends import_events3.EventEmitter {
   /** Timestamp when the client became ready. Null until READY is received. */
   readyAt = null;
   _ws = null;
+  /** When waitForGuilds, set of guild IDs we're waiting for GUILD_CREATE on. Null when not waiting. */
+  _pendingGuildIds = null;
+  /** Per-channel message cache (channelId -> messageId -> APIMessage). Used when options.cache.messages > 0. */
+  _messageCaches = null;
   /**
    * Resolve an emoji argument to the API format (unicode or "name:id").
    * Supports: <:name:id>, :name:, name:id, { name, id }, unicode.
@@ -3162,9 +3235,9 @@ var Client = class extends import_events3.EventEmitter {
       if (guildId) {
         await this.assertEmojiInGuild(emoji.id, guildId);
       }
-      return (0, import_util7.formatEmoji)({ name: emoji.name, id: emoji.id, animated: emoji.animated });
+      return (0, import_util8.formatEmoji)({ name: emoji.name, id: emoji.id, animated: emoji.animated });
     }
-    const parsed = (0, import_util7.parseEmoji)(
+    const parsed = (0, import_util8.parseEmoji)(
       typeof emoji === "string" ? emoji : emoji.id ? `:${emoji.name}:` : emoji.name
     );
     if (!parsed) throw new Error("Invalid emoji");
@@ -3172,16 +3245,16 @@ var Client = class extends import_events3.EventEmitter {
       if (guildId) {
         await this.assertEmojiInGuild(parsed.id, guildId);
       }
-      return (0, import_util7.formatEmoji)(parsed);
+      return (0, import_util8.formatEmoji)(parsed);
     }
     if (!/^\w+$/.test(parsed.name)) return parsed.name;
-    const unicodeFromShortcode = (0, import_util7.getUnicodeFromShortcode)(parsed.name);
+    const unicodeFromShortcode = (0, import_util8.getUnicodeFromShortcode)(parsed.name);
     if (unicodeFromShortcode) return unicodeFromShortcode;
     if (guildId) {
       const emojis = await this.rest.get(import_types21.Routes.guildEmojis(guildId));
       const list = Array.isArray(emojis) ? emojis : Object.values(emojis ?? {});
       const found = list.find((e) => e.name && e.name.toLowerCase() === parsed.name.toLowerCase());
-      if (found) return (0, import_util7.formatEmoji)({ ...parsed, id: found.id, animated: found.animated });
+      if (found) return (0, import_util8.formatEmoji)({ ...parsed, id: found.id, animated: found.animated });
       throw new Error(
         `Custom emoji ":${parsed.name}:" not found in guild. Use name:id or <:name:id> format.`
       );
@@ -3227,7 +3300,7 @@ var Client = class extends import_events3.EventEmitter {
    * const message = await channel?.messages?.fetch(messageId);
    */
   async fetchMessage(channelId, messageId) {
-    (0, import_util7.emitDeprecationWarning)(
+    (0, import_util8.emitDeprecationWarning)(
       "Client.fetchMessage()",
       "Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.resolve(channelId))?.messages?.fetch(messageId)"
     );
@@ -3236,10 +3309,52 @@ var Client = class extends import_events3.EventEmitter {
   /**
    * Send a message to any channel by ID. Shorthand for client.channels.send().
    * Works even when the channel is not cached.
+   * @deprecated Use client.channels.send(channelId, payload).
    */
   async sendToChannel(channelId, payload) {
+    (0, import_util8.emitDeprecationWarning)(
+      "Client.sendToChannel()",
+      "Use client.channels.send(channelId, payload)."
+    );
     return this.channels.send(channelId, payload);
   }
+  /**
+   * Get the message cache for a channel. Returns null if message caching is disabled.
+   * Used by MessageManager.get() and event handlers.
+   * @internal
+   */
+  _getMessageCache(channelId) {
+    const limit = this.options.cache?.messages ?? 0;
+    if (limit <= 0) return null;
+    if (!this._messageCaches) this._messageCaches = /* @__PURE__ */ new Map();
+    let cache = this._messageCaches.get(channelId);
+    if (!cache) {
+      cache = /* @__PURE__ */ new Map();
+      this._messageCaches.set(channelId, cache);
+    }
+    return cache;
+  }
+  /**
+   * Add a message to the channel cache. Evicts oldest (FIFO) when over limit.
+   * @internal
+   */
+  _addMessageToCache(channelId, data) {
+    const cache = this._getMessageCache(channelId);
+    if (!cache) return;
+    const limit = this.options.cache?.messages ?? 0;
+    if (limit > 0 && cache.size >= limit && !cache.has(data.id)) {
+      const firstKey = cache.keys().next().value;
+      if (firstKey !== void 0) cache.delete(firstKey);
+    }
+    cache.set(data.id, { ...data });
+  }
+  /**
+   * Remove a message from the channel cache.
+   * @internal
+   */
+  _removeMessageFromCache(channelId, messageId) {
+    this._messageCaches?.get(channelId)?.delete(messageId);
+  }
   /**
    * Get or create a User from API data. Caches in client.users.
    * Updates existing user's username, avatar, etc. when fresh data is provided.
@@ -3320,7 +3435,13 @@ var Client = class extends import_events3.EventEmitter {
         data
       }) => {
         this.user = new ClientUser(this, data.user);
+        const waitForGuilds = this.options.waitForGuilds === true;
+        const pending = waitForGuilds ? /* @__PURE__ */ new Set() : null;
         for (const g of data.guilds ?? []) {
+          if (g.unavailable === true) {
+            if (pending !== null && g.id) pending.add(g.id);
+            continue;
+          }
           const guildData = normalizeGuildPayload(g);
           if (!guildData) continue;
           const guild = new Guild(this, guildData);
@@ -3340,8 +3461,11 @@ var Client = class extends import_events3.EventEmitter {
             });
           }
         }
-        this.readyAt = /* @__PURE__ */ new Date();
-        this.emit(Events.Ready);
+        if (pending !== null && pending.size > 0) {
+          this._pendingGuildIds = pending;
+          return;
+        }
+        this._finalizeReady();
       }
     );
     this._ws.on("error", ({ error }) => this.emit(Events.Error, error));
@@ -3349,6 +3473,25 @@ var Client = class extends import_events3.EventEmitter {
     await this._ws.connect();
     return token;
   }
+  /**
+   * Called when all guilds have been received (or immediately if not waiting).
+   * Sets readyAt, emits Ready, clears pending state.
+   */
+  _finalizeReady() {
+    this._pendingGuildIds = null;
+    this.readyAt = /* @__PURE__ */ new Date();
+    this.emit(Events.Ready);
+  }
+  /**
+   * Called by GUILD_CREATE handler when waitForGuilds is enabled.
+   * Removes guild from pending set; when empty, finalizes ready.
+   */
+  _onGuildReceived(guildId) {
+    const pending = this._pendingGuildIds;
+    if (pending === null) return;
+    pending.delete(guildId);
+    if (pending.size === 0) this._finalizeReady();
+  }
   /** Disconnect from the gateway and clear cached data. */
   async destroy() {
     if (this._ws) {
@@ -3358,6 +3501,7 @@ var Client = class extends import_events3.EventEmitter {
     this.rest.setToken(null);
     this.user = null;
     this.readyAt = null;
+    this._pendingGuildIds = null;
     this.guilds.clear();
     this.channels.clear();
     this.users.clear();
@@ -3388,8 +3532,8 @@ var Client = class extends import_events3.EventEmitter {
 // src/index.ts
 var import_builders3 = require("@fluxerjs/builders");
 var import_types22 = require("@fluxerjs/types");
-var import_util8 = require("@fluxerjs/util");
 var import_util9 = require("@fluxerjs/util");
+var import_util10 = require("@fluxerjs/util");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AttachmentBuilder,