@fluxerjs/core 1.1.9 → 1.2.0

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as _fluxerjs_types from '@fluxerjs/types';
 import { APISticker, APIEmoji, APIEmbed, APIWebhook, APIWebhookUpdateRequest, APIWebhookTokenUpdateRequest, APIChannelOverwrite, APIChannel, APIChannelPartial, ChannelType, GatewayReactionEmoji, GatewayMessageReactionAddDispatchData, GatewayMessageReactionRemoveDispatchData, APIMessageAttachment, MessageType, APIMessageSticker, APIMessageReaction, APIMessageReference, APIMessageSnapshot, APIMessageCall, APIMessage, APIUserPartial, APIGuildMember, APIRole, RESTUpdateRoleBody, APIBan, GuildFeature, GuildVerificationLevel, DefaultMessageNotifications, GuildExplicitContentFilter, GuildMFALevel, APIGuild, RESTCreateRoleBody, APIGuildAuditLog, APIVanityURL, APIGuildPartial, APIInvite, GatewayPresenceUpdateData, APIProfileResponse, GatewayMessageReactionRemoveAllDispatchData, GatewayMessageReactionRemoveEmojiDispatchData, GatewayVoiceStateUpdateDispatchData, GatewayVoiceServerUpdateDispatchData, GatewayGuildEmojisUpdateDispatchData, GatewayGuildStickersUpdateDispatchData, GatewayGuildIntegrationsUpdateDispatchData, GatewayGuildScheduledEventCreateDispatchData, GatewayGuildScheduledEventUpdateDispatchData, GatewayGuildScheduledEventDeleteDispatchData, GatewayChannelPinsUpdateDispatchData, GatewayPresenceUpdateDispatchData, GatewayWebhooksUpdateDispatchData, APIInstance, GatewaySendPayload, Routes } from '@fluxerjs/types';
 export { GatewayOpcodes, MessageAttachmentFlags, Routes } from '@fluxerjs/types';
 import { PermissionResolvable } from '@fluxerjs/util';
-export { PermissionFlags, PermissionResolvable, PermissionString, PermissionsBitField, UserFlagsBitField, UserFlagsBits, UserFlagsResolvable, UserFlagsString, resolvePermissionsToBitfield, resolveTenorToImageUrl } from '@fluxerjs/util';
+export { PermissionFlags, PermissionResolvable, PermissionString, PermissionsBitField, UserFlagsBitField, UserFlagsBits, UserFlagsResolvable, UserFlagsString, parsePrefixCommand, parseUserMention, resolvePermissionsToBitfield, resolveTenorToImageUrl } from '@fluxerjs/util';
 import { Collection } from '@fluxerjs/collection';
 import { EmbedBuilder } from '@fluxerjs/builders';
 export { AttachmentBuilder, EmbedBuilder, MessagePayload } from '@fluxerjs/builders';
@@ -141,9 +141,12 @@ interface MessageAttachmentMeta {
     /** MessageAttachmentFlags: IS_SPOILER (8), CONTAINS_EXPLICIT_MEDIA (16), IS_ANIMATED (32) */
     flags?: number;
 }
-/** Options for sending a message (content, embeds, files). Used by Message.send, Channel.send, ChannelManager.send. */
+/** Options for sending a message (content, embeds, files). Used by Message.send, Channel.send, ChannelManager.send.
+ * EmbedBuilder instances are auto-converted to API format—no need to call .toJSON().
+ */
 type MessageSendOptions = string | {
     content?: string;
+    /** EmbedBuilder instances are auto-converted; raw APIEmbed also supported. */
     embeds?: (APIEmbed | EmbedBuilder)[];
     /** File attachments. When present, request uses multipart/form-data. */
     files?: MessageFileData[];
@@ -221,7 +224,7 @@ declare class Webhook extends Base {
      * @throws Error if token is not available
      * @example
      * await webhook.send('Hello!');
-     * await webhook.send({ embeds: [embed.toJSON()] });
+     * await webhook.send({ embeds: [embed] });
      * await webhook.send({ content: 'File attached', files: [{ name: 'data.txt', data: buffer }] });
      * const msg = await webhook.send({ content: 'Hi' }, true);
      */
@@ -570,6 +573,17 @@ declare class Message extends Base {
     get channel(): Channel | null;
     /** Guild where this message was sent. Resolved from cache; null for DMs or if not cached. */
     get guild(): Guild | null;
+    /**
+     * Resolve the channel (from cache or API). Use when you need the channel and it may not be cached.
+     * @returns The channel
+     * @throws FluxerError with CHANNEL_NOT_FOUND if the channel does not exist
+     */
+    resolveChannel(): Promise<Channel>;
+    /**
+     * Resolve the guild (from cache or API). Returns null for DMs.
+     * @returns The guild, or null if this is a DM or guild not found
+     */
+    resolveGuild(): Promise<Guild | null>;
     /** @param data - API message from POST/PATCH /channels/{id}/messages or gateway MESSAGE_CREATE */
     constructor(client: Client, data: APIMessage);
     /**
@@ -577,7 +591,7 @@ declare class Message extends Base {
      * @param options - Text content or object with content, embeds, and/or files
      * @example
      * await message.send('Pong!');
-     * await message.send({ embeds: [embed.toJSON()] });
+     * await message.send({ embeds: [embed] }); // EmbedBuilder auto-converted
      * await message.send({ content: 'File', files: [{ name: 'data.txt', data }] });
      */
     send(options: MessageSendOptions): Promise<Message>;
@@ -587,12 +601,15 @@ declare class Message extends Base {
      * @param options - Text content or object with content and/or embeds
      * @example
      * await message.sendTo(logChannelId, 'User ' + message.author.username + ' said: ' + message.content);
-     * await message.sendTo(announceChannelId, { embeds: [embed.toJSON()] });
+     * await message.sendTo(announceChannelId, { embeds: [embed] });
      */
     sendTo(channelId: string, options: MessageSendOptions): Promise<Message>;
     /**
-     * Reply to this message.
+     * Reply to this message (shows as a reply in the client).
      * @param options - Text content or object with content, embeds, and/or files
+     * @example
+     * await message.reply('Pong!');
+     * await message.reply({ embeds: [embed] });
      */
     reply(options: MessageSendOptions): Promise<Message>;
     /**
@@ -857,6 +874,17 @@ declare class GuildMember extends Base {
 declare class GuildMemberManager extends Collection<string, GuildMember> {
     private readonly guild;
     constructor(guild: Guild);
+    /**
+     * Get a guild member from cache or fetch from the API if not present.
+     * Convenience helper to avoid repeating `guild.members.get(userId) ?? (await guild.fetchMember(userId))`.
+     * @param userId - Snowflake of the user
+     * @returns The guild member
+     * @throws FluxerError with MEMBER_NOT_FOUND if user is not in the guild (404)
+     * @example
+     * const member = await guild.members.resolve(userId);
+     * console.log(member.displayName);
+     */
+    resolve(userId: string): Promise<GuildMember>;
     /**
      * The current bot user as a GuildMember in this guild.
      * Returns null if the bot's member is not cached or client.user is null.
@@ -1279,7 +1307,20 @@ interface PartialMessage {
  */
 declare class ChannelManager extends Collection<string, Channel> {
     private readonly client;
+    private readonly maxSize;
     constructor(client: Client);
+    set(key: string, value: Channel): this;
+    /**
+     * Get a channel from cache or fetch from the API if not present.
+     * Convenience helper to avoid repeating `client.channels.get(id) ?? (await client.channels.fetch(id))`.
+     * @param channelId - Snowflake of the channel
+     * @returns The channel
+     * @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!');
+     */
+    resolve(channelId: string): Promise<Channel>;
     /**
      * Fetch a channel by ID from the API (or return from cache if present).
      * @param channelId - Snowflake of the channel
@@ -1296,9 +1337,9 @@ declare class ChannelManager extends Collection<string, Channel> {
      * @param messageId - Snowflake of the message
      * @returns The message
      * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
-     * @deprecated Use channel.messages.fetch(messageId). Prefer (await client.channels.fetch(channelId))?.messages?.fetch(messageId).
+     * @deprecated Use channel.messages.fetch(messageId). Prefer (await client.channels.resolve(channelId))?.messages?.fetch(messageId).
      * @example
-     * const channel = await client.channels.fetch(channelId);
+     * const channel = await client.channels.resolve(channelId);
      * const message = await channel?.messages?.fetch(messageId);
      */
     fetchMessage(channelId: string, messageId: string): Promise<Message>;
@@ -1310,7 +1351,7 @@ declare class ChannelManager extends Collection<string, Channel> {
      * @returns The created message
      * @example
      * await client.channels.send(logChannelId, 'User joined!');
-     * await client.channels.send(channelId, { embeds: [embed.toJSON()] });
+     * await client.channels.send(channelId, { embeds: [embed] });
      * await client.channels.send(channelId, { content: 'Report', files: [{ name: 'log.txt', data }] });
      */
     send(channelId: string, payload: MessageSendOptions): Promise<Message>;
@@ -1322,7 +1363,19 @@ declare class ChannelManager extends Collection<string, Channel> {
  */
 declare class GuildManager extends Collection<string, Guild> {
     private readonly client;
+    private readonly maxSize;
     constructor(client: Client);
+    set(key: string, value: Guild): this;
+    /**
+     * Get a guild from cache or fetch from the API if not present.
+     * Convenience helper to avoid repeating `client.guilds.get(id) ?? (await client.guilds.fetch(id))`.
+     * @param guildId - Snowflake of the guild
+     * @returns The guild, or null if not found
+     * @example
+     * const guild = await client.guilds.resolve(message.guildId);
+     * if (guild) console.log(guild.name);
+     */
+    resolve(guildId: string): Promise<Guild | null>;
     /**
      * Create a guild. POST /guilds.
      * @param options - name (required), icon (base64), empty_features
@@ -1344,9 +1397,20 @@ declare class GuildManager extends Collection<string, Guild> {
     fetch(guildId: string): Promise<Guild | null>;
 }
 
+/** Optional cache size limits. When exceeded, oldest entries are evicted (FIFO). Omit or use 0 for unbounded. */
+interface CacheSizeLimits {
+    channels?: number;
+    guilds?: number;
+    users?: number;
+}
 interface ClientOptions {
     rest?: Partial<ConstructorParameters<typeof REST>[0]>;
+    /** Gateway intents. Not yet supported by Fluxer—value is always sent as 0. Set suppressIntentWarning to silence the warning. */
     intents?: number;
+    /** Suppress the warning when intents are set (Fluxer does not support intents yet). */
+    suppressIntentWarning?: boolean;
+    /** Cache size limits (channels, guilds, users). When exceeded, oldest entries are evicted. Omit or 0 = unbounded. */
+    cache?: CacheSizeLimits;
     /** Initial presence (status, custom_status, etc.) sent on identify. Can also update via PresenceUpdate after connect. */
     presence?: GatewayPresenceUpdateData;
     /** Optional WebSocket constructor (e.g. `require('ws')` in Node for compatibility) */
@@ -1446,7 +1510,9 @@ interface FetchedUserWithProfile {
  */
 declare class UsersManager extends Collection<string, User> {
     private readonly client;
+    private readonly maxSize;
     constructor(client: Client);
+    set(key: string, value: User): this;
     /**
      * Fetch a user by ID from the API.
      * Updates cache if user already exists.
@@ -1609,9 +1675,9 @@ declare class Client extends EventEmitter {
      * @param messageId - Snowflake of the message
      * @returns The message
      * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
-     * @deprecated Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.fetch(channelId))?.messages?.fetch(messageId)
+     * @deprecated Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.resolve(channelId))?.messages?.fetch(messageId)
      * @example
-     * const channel = await client.channels.fetch(channelId);
+     * const channel = await client.channels.resolve(channelId);
      * const message = await channel?.messages?.fetch(messageId);
      */
     fetchMessage(channelId: string, messageId: string): Promise<Message>;
@@ -1648,6 +1714,13 @@ declare class Client extends EventEmitter {
     isReady(): this is Client & {
         user: NonNullable<Client['user']>;
     };
+    /**
+     * Throws if the client is not ready. Use before accessing client.user or other post-ready state.
+     * @throws FluxerError with CLIENT_NOT_READY if client has not received Ready yet
+     */
+    assertReady(): asserts this is Client & {
+        user: NonNullable<Client['user']>;
+    };
     static get Routes(): typeof Routes;
 }
 

package/dist/index.js

@@ -292,6 +292,21 @@ var init_Message = __esm({
       get guild() {
         return this.guildId ? this.client.guilds.get(this.guildId) ?? null : null;
       }
+      /**
+       * Resolve the channel (from cache or API). Use when you need the channel and it may not be cached.
+       * @returns The channel
+       * @throws FluxerError with CHANNEL_NOT_FOUND if the channel does not exist
+       */
+      async resolveChannel() {
+        return this.client.channels.resolve(this.channelId);
+      }
+      /**
+       * Resolve the guild (from cache or API). Returns null for DMs.
+       * @returns The guild, or null if this is a DM or guild not found
+       */
+      async resolveGuild() {
+        return this.guildId ? this.client.guilds.resolve(this.guildId) : null;
+      }
       /** @param data - API message from POST/PATCH /channels/{id}/messages or gateway MESSAGE_CREATE */
       constructor(client, data) {
         super();
@@ -327,7 +342,7 @@ var init_Message = __esm({
        * @param options - Text content or object with content, embeds, and/or files
        * @example
        * await message.send('Pong!');
-       * await message.send({ embeds: [embed.toJSON()] });
+       * await message.send({ embeds: [embed] }); // EmbedBuilder auto-converted
        * await message.send({ content: 'File', files: [{ name: 'data.txt', data }] });
        */
       async send(options) {
@@ -344,14 +359,17 @@ var init_Message = __esm({
        * @param options - Text content or object with content and/or embeds
        * @example
        * await message.sendTo(logChannelId, 'User ' + message.author.username + ' said: ' + message.content);
-       * await message.sendTo(announceChannelId, { embeds: [embed.toJSON()] });
+       * await message.sendTo(announceChannelId, { embeds: [embed] });
        */
       async sendTo(channelId, options) {
         return this.client.channels.send(channelId, options);
       }
       /**
-       * Reply to this message.
+       * Reply to this message (shows as a reply in the client).
        * @param options - Text content or object with content, embeds, and/or files
+       * @example
+       * await message.reply('Pong!');
+       * await message.reply({ embeds: [embed] });
        */
       async reply(options) {
         const opts = typeof options === "string" ? { content: options } : options;
@@ -743,7 +761,7 @@ var init_Webhook = __esm({
        * @throws Error if token is not available
        * @example
        * await webhook.send('Hello!');
-       * await webhook.send({ embeds: [embed.toJSON()] });
+       * await webhook.send({ embeds: [embed] });
        * await webhook.send({ content: 'File attached', files: [{ name: 'data.txt', data: buffer }] });
        * const msg = await webhook.send({ content: 'Hi' }, true);
        */
@@ -1484,6 +1502,19 @@ var init_GuildMemberManager = __esm({
         super();
         this.guild = guild;
       }
+      /**
+       * Get a guild member from cache or fetch from the API if not present.
+       * Convenience helper to avoid repeating `guild.members.get(userId) ?? (await guild.fetchMember(userId))`.
+       * @param userId - Snowflake of the user
+       * @returns The guild member
+       * @throws FluxerError with MEMBER_NOT_FOUND if user is not in the guild (404)
+       * @example
+       * const member = await guild.members.resolve(userId);
+       * console.log(member.displayName);
+       */
+      async resolve(userId) {
+        return this.get(userId) ?? this.guild.fetchMember(userId);
+      }
       /**
        * The current bot user as a GuildMember in this guild.
        * Returns null if the bot's member is not cached or client.user is null.
@@ -2490,6 +2521,30 @@ var init_MessageReaction = __esm({
   }
 });
 
+// src/util/guildUtils.ts
+var guildUtils_exports = {};
+__export(guildUtils_exports, {
+  normalizeGuildPayload: () => normalizeGuildPayload
+});
+function normalizeGuildPayload(raw) {
+  if (!raw || typeof raw !== "object") {
+    return null;
+  }
+  if ("properties" in raw && raw.properties != null && typeof raw.properties === "object") {
+    const r = raw;
+    return {
+      ...r.properties,
+      roles: r.roles
+    };
+  }
+  return raw;
+}
+var init_guildUtils = __esm({
+  "src/util/guildUtils.ts"() {
+    "use strict";
+  }
+});
+
 // src/client/ClientUser.ts
 var ClientUser_exports = {};
 __export(ClientUser_exports, {
@@ -2584,6 +2639,8 @@ __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
 });
@@ -2607,6 +2664,28 @@ var ChannelManager = class extends import_collection4.Collection {
   constructor(client) {
     super();
     this.client = client;
+    this.maxSize = client.options?.cache?.channels ?? 0;
+  }
+  maxSize;
+  set(key, value) {
+    if (this.maxSize > 0 && this.size >= this.maxSize && !this.has(key)) {
+      const firstKey = this.keys().next().value;
+      if (firstKey !== void 0) this.delete(firstKey);
+    }
+    return super.set(key, value);
+  }
+  /**
+   * Get a channel from cache or fetch from the API if not present.
+   * Convenience helper to avoid repeating `client.channels.get(id) ?? (await client.channels.fetch(id))`.
+   * @param channelId - Snowflake of the channel
+   * @returns The channel
+   * @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!');
+   */
+  async resolve(channelId) {
+    return this.get(channelId) ?? this.fetch(channelId);
   }
   /**
    * Fetch a channel by ID from the API (or return from cache if present).
@@ -2632,6 +2711,10 @@ var ChannelManager = class extends import_collection4.Collection {
         });
       }
       this.set(channel.id, channel);
+      if ("guildId" in channel && channel.guildId) {
+        const guild = this.client.guilds.get(channel.guildId);
+        if (guild) guild.channels.set(channel.id, channel);
+      }
       return channel;
     } catch (err) {
       if (err instanceof import_rest2.RateLimitError) throw err;
@@ -2650,15 +2733,15 @@ var ChannelManager = class extends import_collection4.Collection {
    * @param messageId - Snowflake of the message
    * @returns The message
    * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
-   * @deprecated Use channel.messages.fetch(messageId). Prefer (await client.channels.fetch(channelId))?.messages?.fetch(messageId).
+   * @deprecated Use channel.messages.fetch(messageId). Prefer (await client.channels.resolve(channelId))?.messages?.fetch(messageId).
    * @example
-   * const channel = await client.channels.fetch(channelId);
+   * const channel = await client.channels.resolve(channelId);
    * const message = await channel?.messages?.fetch(messageId);
    */
   async fetchMessage(channelId, messageId) {
     (0, import_util2.emitDeprecationWarning)(
       "ChannelManager.fetchMessage()",
-      "Use channel.messages.fetch(messageId). Prefer (await client.channels.fetch(channelId))?.messages?.fetch(messageId)."
+      "Use channel.messages.fetch(messageId). Prefer (await client.channels.resolve(channelId))?.messages?.fetch(messageId)."
     );
     try {
       const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
@@ -2685,7 +2768,7 @@ var ChannelManager = class extends import_collection4.Collection {
    * @returns The created message
    * @example
    * await client.channels.send(logChannelId, 'User joined!');
-   * await client.channels.send(channelId, { embeds: [embed.toJSON()] });
+   * await client.channels.send(channelId, { embeds: [embed] });
    * await client.channels.send(channelId, { content: 'Report', files: [{ name: 'log.txt', data }] });
    */
   async send(channelId, payload) {
@@ -2706,6 +2789,27 @@ var GuildManager = class extends import_collection7.Collection {
   constructor(client) {
     super();
     this.client = client;
+    this.maxSize = client.options?.cache?.guilds ?? 0;
+  }
+  maxSize;
+  set(key, value) {
+    if (this.maxSize > 0 && this.size >= this.maxSize && !this.has(key)) {
+      const firstKey = this.keys().next().value;
+      if (firstKey !== void 0) this.delete(firstKey);
+    }
+    return super.set(key, value);
+  }
+  /**
+   * Get a guild from cache or fetch from the API if not present.
+   * Convenience helper to avoid repeating `client.guilds.get(id) ?? (await client.guilds.fetch(id))`.
+   * @param guildId - Snowflake of the guild
+   * @returns The guild, or null if not found
+   * @example
+   * const guild = await client.guilds.resolve(message.guildId);
+   * if (guild) console.log(guild.name);
+   */
+  async resolve(guildId) {
+    return this.get(guildId) ?? this.fetch(guildId);
   }
   /**
    * Create a guild. POST /guilds.
@@ -2762,6 +2866,15 @@ var UsersManager = class extends import_collection8.Collection {
   constructor(client) {
     super();
     this.client = client;
+    this.maxSize = client.options?.cache?.users ?? 0;
+  }
+  maxSize;
+  set(key, value) {
+    if (this.maxSize > 0 && this.size >= this.maxSize && !this.has(key)) {
+      const firstKey = this.keys().next().value;
+      if (firstKey !== void 0) this.delete(firstKey);
+    }
+    return super.set(key, value);
   }
   /**
    * Fetch a user by ID from the API.
@@ -2904,14 +3017,18 @@ handlers.set("GUILD_CREATE", async (client, d) => {
   const { Guild: Guild2 } = await Promise.resolve().then(() => (init_Guild(), Guild_exports));
   const { Channel: Channel2 } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
   const { GuildMember: GuildMember2 } = await Promise.resolve().then(() => (init_GuildMember(), GuildMember_exports));
-  const raw = d;
-  const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
+  const { normalizeGuildPayload: normalizeGuildPayload2 } = await Promise.resolve().then(() => (init_guildUtils(), guildUtils_exports));
+  const guildData = normalizeGuildPayload2(d);
+  if (!guildData) return;
   const guild = new Guild2(client, guildData);
   client.guilds.set(guild.id, guild);
   const g = d;
   for (const ch of g.channels ?? []) {
     const channel = Channel2.from(client, ch);
-    if (channel) client.channels.set(channel.id, channel);
+    if (channel) {
+      client.channels.set(channel.id, channel);
+      guild.channels.set(channel.id, channel);
+    }
   }
   for (const m of g.members ?? []) {
     if (m?.user?.id) {
@@ -2927,8 +3044,9 @@ handlers.set("GUILD_CREATE", async (client, d) => {
 });
 handlers.set("GUILD_UPDATE", async (client, d) => {
   const { Guild: Guild2 } = await Promise.resolve().then(() => (init_Guild(), Guild_exports));
-  const raw = d;
-  const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
+  const { normalizeGuildPayload: normalizeGuildPayload2 } = await Promise.resolve().then(() => (init_guildUtils(), guildUtils_exports));
+  const guildData = normalizeGuildPayload2(d);
+  if (!guildData) return;
   const old = client.guilds.get(guildData.id);
   const updated = new Guild2(client, guildData);
   client.guilds.set(updated.id, updated);
@@ -2947,6 +3065,10 @@ handlers.set("CHANNEL_CREATE", async (client, d) => {
   const ch = Channel2.from(client, d);
   if (ch) {
     client.channels.set(ch.id, ch);
+    if ("guildId" in ch && ch.guildId) {
+      const guild = client.guilds.get(ch.guildId);
+      if (guild) guild.channels.set(ch.id, ch);
+    }
     client.emit(Events.ChannelCreate, ch);
   }
 });
@@ -2957,6 +3079,10 @@ handlers.set("CHANNEL_UPDATE", async (client, d) => {
   const newCh = Channel2.from(client, ch);
   if (newCh) {
     client.channels.set(newCh.id, newCh);
+    if ("guildId" in newCh && newCh.guildId) {
+      const guild = client.guilds.get(newCh.guildId);
+      if (guild) guild.channels.set(newCh.id, newCh);
+    }
     client.emit(Events.ChannelUpdate, oldCh ?? newCh, newCh);
   }
 });
@@ -2964,6 +3090,10 @@ handlers.set("CHANNEL_DELETE", async (client, d) => {
   const ch = d;
   const channel = client.channels.get(ch.id);
   if (channel) {
+    if ("guildId" in channel && channel.guildId) {
+      const guild = client.guilds.get(channel.guildId);
+      if (guild) guild.channels.delete(channel.id);
+    }
     client.channels.delete(ch.id);
     client.emit(Events.ChannelDelete, channel);
   }
@@ -3029,7 +3159,12 @@ handlers.set("MESSAGE_DELETE_BULK", async (client, d) => {
 handlers.set("GUILD_BAN_ADD", async (client, d) => {
   const data = d;
   const { GuildBan: GuildBan2 } = await Promise.resolve().then(() => (init_GuildBan(), GuildBan_exports));
-  const ban = new GuildBan2(client, data, data.guild_id);
+  const banData = {
+    user: data.user,
+    reason: data.reason ?? null,
+    guild_id: data.guild_id
+  };
+  const ban = new GuildBan2(client, banData, data.guild_id);
   client.emit(Events.GuildBanAdd, ban);
 });
 handlers.set("GUILD_BAN_REMOVE", async (client, d) => {
@@ -3190,9 +3325,9 @@ var Client = class extends import_events3.EventEmitter {
       }
       return (0, import_util7.formatEmoji)(parsed);
     }
-    if (!/^\w+$/.test(parsed.name)) return encodeURIComponent(parsed.name);
+    if (!/^\w+$/.test(parsed.name)) return parsed.name;
     const unicodeFromShortcode = (0, import_util7.getUnicodeFromShortcode)(parsed.name);
-    if (unicodeFromShortcode) return encodeURIComponent(unicodeFromShortcode);
+    if (unicodeFromShortcode) return unicodeFromShortcode;
     if (guildId) {
       const emojis = await this.rest.get(import_types20.Routes.guildEmojis(guildId));
       const list = Array.isArray(emojis) ? emojis : Object.values(emojis ?? {});
@@ -3207,7 +3342,7 @@ var Client = class extends import_events3.EventEmitter {
         `Custom emoji ":${parsed.name}:" requires guild context. Use message.react() in a guild channel, or pass guildId to client.resolveEmoji().`
       );
     }
-    return encodeURIComponent(parsed.name);
+    return parsed.name;
   }
   /**
    * Asserts that a custom emoji (by id) belongs to the given guild.
@@ -3237,15 +3372,15 @@ var Client = class extends import_events3.EventEmitter {
    * @param messageId - Snowflake of the message
    * @returns The message
    * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
-   * @deprecated Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.fetch(channelId))?.messages?.fetch(messageId)
+   * @deprecated Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.resolve(channelId))?.messages?.fetch(messageId)
    * @example
-   * const channel = await client.channels.fetch(channelId);
+   * const channel = await client.channels.resolve(channelId);
    * const message = await channel?.messages?.fetch(messageId);
    */
   async fetchMessage(channelId, messageId) {
     (0, import_util7.emitDeprecationWarning)(
       "Client.fetchMessage()",
-      "Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.fetch(channelId))?.messages?.fetch(messageId)"
+      "Use channel.messages.fetch(messageId). For IDs-only: (await client.channels.resolve(channelId))?.messages?.fetch(messageId)"
     );
     return this.channels.fetchMessage(channelId, messageId);
   }
@@ -3306,12 +3441,14 @@ var Client = class extends import_events3.EventEmitter {
     this.rest.setToken(token);
     let intents = this.options.intents ?? 0;
     if (intents !== 0) {
-      if (typeof process !== "undefined" && process.emitWarning) {
-        process.emitWarning("Fluxer does not support intents yet. Value has been set to 0.", {
-          type: "FluxerIntents"
-        });
-      } else {
-        console.warn("Fluxer does not support intents yet. Value has been set to 0.");
+      if (!this.options.suppressIntentWarning) {
+        if (typeof process !== "undefined" && process.emitWarning) {
+          process.emitWarning("Fluxer does not support intents yet. Value has been set to 0.", {
+            type: "FluxerIntents"
+          });
+        } else {
+          console.warn("Fluxer does not support intents yet. Value has been set to 0.");
+        }
       }
       intents = 0;
     }
@@ -3337,17 +3474,19 @@ var Client = class extends import_events3.EventEmitter {
         const { Guild: Guild2 } = await Promise.resolve().then(() => (init_Guild(), Guild_exports));
         const { Channel: Channel2 } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
         this.user = new ClientUser2(this, data.user);
+        const { normalizeGuildPayload: normalizeGuildPayload2 } = await Promise.resolve().then(() => (init_guildUtils(), guildUtils_exports));
         for (const g of data.guilds ?? []) {
-          const guildData = g && typeof g === "object" && "properties" in g && g.properties ? {
-            ...g.properties,
-            roles: g.roles
-          } : g;
+          const guildData = normalizeGuildPayload2(g);
+          if (!guildData) continue;
           const guild = new Guild2(this, guildData);
           this.guilds.set(guild.id, guild);
           const withCh = g;
           for (const ch of withCh.channels ?? []) {
             const channel = Channel2.from(this, ch);
-            if (channel) this.channels.set(channel.id, channel);
+            if (channel) {
+              this.channels.set(channel.id, channel);
+              guild.channels.set(channel.id, channel);
+            }
           }
           if (withCh.voice_states?.length) {
             this.emit(Events.VoiceStatesSync, {
@@ -3382,6 +3521,17 @@ var Client = class extends import_events3.EventEmitter {
   isReady() {
     return this.readyAt !== null && this.user !== null;
   }
+  /**
+   * Throws if the client is not ready. Use before accessing client.user or other post-ready state.
+   * @throws FluxerError with CLIENT_NOT_READY if client has not received Ready yet
+   */
+  assertReady() {
+    if (!this.isReady()) {
+      throw new FluxerError("Client is not ready yet. Wait for the Ready event before accessing client.user.", {
+        code: ErrorCodes.ClientNotReady
+      });
+    }
+  }
   static get Routes() {
     return import_types20.Routes;
   }
@@ -3465,6 +3615,8 @@ init_cdn();
   cdnDisplayAvatarURL,
   cdnMemberAvatarURL,
   cdnMemberBannerURL,
+  parsePrefixCommand,
+  parseUserMention,
   resolvePermissionsToBitfield,
   resolveTenorToImageUrl
 });