@fluxerjs/core 1.1.0 → 1.1.2

package/dist/index.js

@@ -49,7 +49,8 @@ var init_ErrorCodes = __esm({
       ChannelNotFound: "CHANNEL_NOT_FOUND",
       MessageNotFound: "MESSAGE_NOT_FOUND",
       GuildNotFound: "GUILD_NOT_FOUND",
-      MemberNotFound: "MEMBER_NOT_FOUND"
+      MemberNotFound: "MEMBER_NOT_FOUND",
+      RoleNotFound: "ROLE_NOT_FOUND"
     };
   }
 });
@@ -86,25 +87,12 @@ var init_messageUtils = __esm({
   }
 });
 
-// src/client/MessageManager.ts
-var MessageManager;
-var init_MessageManager = __esm({
-  "src/client/MessageManager.ts"() {
+// src/structures/Base.ts
+var Base;
+var init_Base = __esm({
+  "src/structures/Base.ts"() {
     "use strict";
-    MessageManager = class {
-      constructor(client, channelId) {
-        this.client = client;
-        this.channelId = channelId;
-      }
-      /**
-       * Fetch a message by ID from this channel.
-       * @param messageId - Snowflake of the message
-       * @returns The message
-       * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
-       */
-      async fetch(messageId) {
-        return this.client.channels.fetchMessage(this.channelId, messageId);
-      }
+    Base = class {
     };
   }
 });
@@ -162,145 +150,20 @@ var init_Events = __esm({
   }
 });
 
-// src/util/MessageCollector.ts
-var import_events, import_collection, MessageCollector;
-var init_MessageCollector = __esm({
-  "src/util/MessageCollector.ts"() {
-    "use strict";
-    import_events = require("events");
-    import_collection = require("@fluxerjs/collection");
-    init_Events();
-    MessageCollector = class extends import_events.EventEmitter {
-      client;
-      channelId;
-      options;
-      collected = new import_collection.Collection();
-      _timeout = null;
-      _ended = false;
-      _listener;
-      constructor(client, channelId, options = {}) {
-        super();
-        this.client = client;
-        this.channelId = channelId;
-        this.options = {
-          filter: options.filter ?? (() => true),
-          time: options.time ?? 0,
-          max: options.max ?? 0
-        };
-        this._listener = (message) => {
-          if (this._ended || message.channelId !== this.channelId) return;
-          if (!this.options.filter(message)) return;
-          this.collected.set(message.id, message);
-          this.emit("collect", message);
-          if (this.options.max > 0 && this.collected.size >= this.options.max) {
-            this.stop("limit");
-          }
-        };
-        this.client.on(Events.MessageCreate, this._listener);
-        if (this.options.time > 0) {
-          this._timeout = setTimeout(() => this.stop("time"), this.options.time);
-        }
-      }
-      stop(reason = "user") {
-        if (this._ended) return;
-        this._ended = true;
-        this.client.off(Events.MessageCreate, this._listener);
-        if (this._timeout) {
-          clearTimeout(this._timeout);
-          this._timeout = null;
-        }
-        this.emit("end", this.collected, reason);
-      }
-      on(event, listener) {
-        return super.on(event, listener);
-      }
-      emit(event, ...args) {
-        return super.emit(event, ...args);
-      }
-    };
-  }
-});
-
-// src/structures/Base.ts
-var Base;
-var init_Base = __esm({
-  "src/structures/Base.ts"() {
-    "use strict";
-    Base = class {
-    };
-  }
-});
-
-// src/util/Constants.ts
-var CDN_URL;
-var init_Constants = __esm({
-  "src/util/Constants.ts"() {
-    "use strict";
-    CDN_URL = "https://fluxerusercontent.com";
-  }
-});
-
-// src/util/cdn.ts
-function getExtension(hash, options) {
-  const ext = options?.extension ?? "png";
-  if (hash?.startsWith("a_")) return "gif";
-  return ext;
-}
-function appendSize(options) {
-  return options?.size ? `?size=${options.size}` : "";
-}
-function cdnAvatarURL(userId, avatarHash, options) {
-  if (!avatarHash) return null;
-  const ext = getExtension(avatarHash, options);
-  const size = appendSize(options);
-  return `${CDN_URL}/avatars/${userId}/${avatarHash}.${ext}${size}`;
-}
-function cdnDisplayAvatarURL(userId, avatarHash, options) {
-  return cdnAvatarURL(userId, avatarHash, options) ?? `${CDN_URL}/avatars/0/0.png`;
-}
-function cdnBannerURL(resourceId, bannerHash, options) {
-  if (!bannerHash) return null;
-  const ext = getExtension(bannerHash, options);
-  const size = appendSize(options);
-  return `${CDN_URL}/banners/${resourceId}/${bannerHash}.${ext}${size}`;
-}
-function cdnMemberAvatarURL(guildId, userId, avatarHash, options) {
-  if (!avatarHash) return null;
-  const ext = getExtension(avatarHash, options);
-  const size = appendSize(options);
-  return `${CDN_URL}/guilds/${guildId}/users/${userId}/avatars/${avatarHash}.${ext}${size}`;
-}
-function cdnMemberBannerURL(guildId, userId, bannerHash, options) {
-  if (!bannerHash) return null;
-  const ext = getExtension(bannerHash, options);
-  const size = appendSize(options);
-  return `${CDN_URL}/guilds/${guildId}/users/${userId}/banners/${bannerHash}.${ext}${size}`;
-}
-function cdnDefaultAvatarURL(discriminatorIndex) {
-  const index = discriminatorIndex != null ? discriminatorIndex % 5 : 0;
-  return `${CDN_URL}/avatars/0/${index}.png`;
-}
-var init_cdn = __esm({
-  "src/util/cdn.ts"() {
-    "use strict";
-    init_Constants();
-  }
-});
-
 // src/util/ReactionCollector.ts
-var import_events2, import_collection2, ReactionCollector;
+var import_events, import_collection, ReactionCollector;
 var init_ReactionCollector = __esm({
   "src/util/ReactionCollector.ts"() {
     "use strict";
-    import_events2 = require("events");
-    import_collection2 = require("@fluxerjs/collection");
+    import_events = require("events");
+    import_collection = require("@fluxerjs/collection");
     init_Events();
-    ReactionCollector = class extends import_events2.EventEmitter {
+    ReactionCollector = class extends import_events.EventEmitter {
       client;
       messageId;
       channelId;
       options;
-      collected = new import_collection2.Collection();
+      collected = new import_collection.Collection();
       _timeout = null;
       _ended = false;
       _listener;
@@ -354,12 +217,12 @@ var Message_exports = {};
 __export(Message_exports, {
   Message: () => Message
 });
-var import_collection3, import_types, import_builders2, Message;
+var import_collection2, import_types, import_builders2, Message;
 var init_Message = __esm({
   "src/structures/Message.ts"() {
     "use strict";
     init_Base();
-    import_collection3 = require("@fluxerjs/collection");
+    import_collection2 = require("@fluxerjs/collection");
     import_types = require("@fluxerjs/types");
     import_builders2 = require("@fluxerjs/builders");
     init_messageUtils();
@@ -414,7 +277,7 @@ var init_Message = __esm({
         this.createdAt = new Date(data.timestamp);
         this.editedAt = data.edited_timestamp ? new Date(data.edited_timestamp) : null;
         this.pinned = data.pinned;
-        this.attachments = new import_collection3.Collection();
+        this.attachments = new import_collection2.Collection();
         for (const a of data.attachments ?? []) this.attachments.set(a.id, a);
         this.type = data.type ?? import_types.MessageType.Default;
         this.flags = data.flags ?? 0;
@@ -596,17 +459,174 @@ var init_Message = __esm({
   }
 });
 
+// src/client/MessageManager.ts
+var import_types2, import_rest, MessageManager;
+var init_MessageManager = __esm({
+  "src/client/MessageManager.ts"() {
+    "use strict";
+    import_types2 = require("@fluxerjs/types");
+    import_rest = require("@fluxerjs/rest");
+    init_FluxerError();
+    init_ErrorCodes();
+    MessageManager = class {
+      constructor(client, channelId) {
+        this.client = client;
+        this.channelId = channelId;
+      }
+      /**
+       * Fetch a message by ID from this channel.
+       * @param messageId - Snowflake of the message
+       * @returns The message
+       * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
+       */
+      async fetch(messageId) {
+        try {
+          const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
+          const data = await this.client.rest.get(
+            import_types2.Routes.channelMessage(this.channelId, messageId)
+          );
+          return new Message2(this.client, data);
+        } catch (err) {
+          if (err instanceof import_rest.RateLimitError) throw err;
+          if (err instanceof import_rest.FluxerAPIError && err.statusCode === 404) {
+            throw new FluxerError(`Message ${messageId} not found in channel ${this.channelId}`, {
+              code: ErrorCodes.MessageNotFound,
+              cause: err
+            });
+          }
+          throw err instanceof FluxerError ? err : new FluxerError(String(err), { cause: err });
+        }
+      }
+    };
+  }
+});
+
+// src/util/MessageCollector.ts
+var import_events2, import_collection3, MessageCollector;
+var init_MessageCollector = __esm({
+  "src/util/MessageCollector.ts"() {
+    "use strict";
+    import_events2 = require("events");
+    import_collection3 = require("@fluxerjs/collection");
+    init_Events();
+    MessageCollector = class extends import_events2.EventEmitter {
+      client;
+      channelId;
+      options;
+      collected = new import_collection3.Collection();
+      _timeout = null;
+      _ended = false;
+      _listener;
+      constructor(client, channelId, options = {}) {
+        super();
+        this.client = client;
+        this.channelId = channelId;
+        this.options = {
+          filter: options.filter ?? (() => true),
+          time: options.time ?? 0,
+          max: options.max ?? 0
+        };
+        this._listener = (message) => {
+          if (this._ended || message.channelId !== this.channelId) return;
+          if (!this.options.filter(message)) return;
+          this.collected.set(message.id, message);
+          this.emit("collect", message);
+          if (this.options.max > 0 && this.collected.size >= this.options.max) {
+            this.stop("limit");
+          }
+        };
+        this.client.on(Events.MessageCreate, this._listener);
+        if (this.options.time > 0) {
+          this._timeout = setTimeout(() => this.stop("time"), this.options.time);
+        }
+      }
+      stop(reason = "user") {
+        if (this._ended) return;
+        this._ended = true;
+        this.client.off(Events.MessageCreate, this._listener);
+        if (this._timeout) {
+          clearTimeout(this._timeout);
+          this._timeout = null;
+        }
+        this.emit("end", this.collected, reason);
+      }
+      on(event, listener) {
+        return super.on(event, listener);
+      }
+      emit(event, ...args) {
+        return super.emit(event, ...args);
+      }
+    };
+  }
+});
+
+// src/util/Constants.ts
+var CDN_URL;
+var init_Constants = __esm({
+  "src/util/Constants.ts"() {
+    "use strict";
+    CDN_URL = "https://fluxerusercontent.com";
+  }
+});
+
+// src/util/cdn.ts
+function getExtension(hash, options) {
+  const ext = options?.extension ?? "png";
+  if (hash?.startsWith("a_")) return "gif";
+  return ext;
+}
+function appendSize(options) {
+  return options?.size ? `?size=${options.size}` : "";
+}
+function cdnAvatarURL(userId, avatarHash, options) {
+  if (!avatarHash) return null;
+  const ext = getExtension(avatarHash, options);
+  const size = appendSize(options);
+  return `${CDN_URL}/avatars/${userId}/${avatarHash}.${ext}${size}`;
+}
+function cdnDisplayAvatarURL(userId, avatarHash, options) {
+  return cdnAvatarURL(userId, avatarHash, options) ?? `${CDN_URL}/avatars/0/0.png`;
+}
+function cdnBannerURL(resourceId, bannerHash, options) {
+  if (!bannerHash) return null;
+  const ext = getExtension(bannerHash, options);
+  const size = appendSize(options);
+  return `${CDN_URL}/banners/${resourceId}/${bannerHash}.${ext}${size}`;
+}
+function cdnMemberAvatarURL(guildId, userId, avatarHash, options) {
+  if (!avatarHash) return null;
+  const ext = getExtension(avatarHash, options);
+  const size = appendSize(options);
+  return `${CDN_URL}/guilds/${guildId}/users/${userId}/avatars/${avatarHash}.${ext}${size}`;
+}
+function cdnMemberBannerURL(guildId, userId, bannerHash, options) {
+  if (!bannerHash) return null;
+  const ext = getExtension(bannerHash, options);
+  const size = appendSize(options);
+  return `${CDN_URL}/guilds/${guildId}/users/${userId}/banners/${bannerHash}.${ext}${size}`;
+}
+function cdnDefaultAvatarURL(discriminatorIndex) {
+  const index = discriminatorIndex != null ? discriminatorIndex % 5 : 0;
+  return `${CDN_URL}/avatars/0/${index}.png`;
+}
+var init_cdn = __esm({
+  "src/util/cdn.ts"() {
+    "use strict";
+    init_Constants();
+  }
+});
+
 // src/structures/Webhook.ts
 var Webhook_exports = {};
 __export(Webhook_exports, {
   Webhook: () => Webhook
 });
-var import_types2, Webhook;
+var import_types3, Webhook;
 var init_Webhook = __esm({
   "src/structures/Webhook.ts"() {
     "use strict";
     init_Base();
-    import_types2 = require("@fluxerjs/types");
+    import_types3 = require("@fluxerjs/types");
     init_messageUtils();
     init_cdn();
     Webhook = class _Webhook extends Base {
@@ -641,7 +661,7 @@ var init_Webhook = __esm({
       }
       /** Delete this webhook. Requires bot token with Manage Webhooks permission. */
       async delete() {
-        await this.client.rest.delete(import_types2.Routes.webhook(this.id), { auth: true });
+        await this.client.rest.delete(import_types3.Routes.webhook(this.id), { auth: true });
       }
       /**
        * Edit this webhook. With token: name and avatar only. Without token (bot auth): name, avatar, and channel_id.
@@ -656,7 +676,7 @@ var init_Webhook = __esm({
           body.channel_id = options.channel_id;
         }
         if (this.token) {
-          const data2 = await this.client.rest.patch(import_types2.Routes.webhookExecute(this.id, this.token), {
+          const data2 = await this.client.rest.patch(import_types3.Routes.webhookExecute(this.id, this.token), {
             body,
             auth: false
           });
@@ -665,7 +685,7 @@ var init_Webhook = __esm({
           this.avatar = w2.avatar ?? null;
           return this;
         }
-        const data = await this.client.rest.patch(import_types2.Routes.webhook(this.id), {
+        const data = await this.client.rest.patch(import_types3.Routes.webhook(this.id), {
           body,
           auth: true
         });
@@ -697,7 +717,7 @@ var init_Webhook = __esm({
         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;
-        const route = import_types2.Routes.webhookExecute(this.id, this.token) + (wait ? "?wait=true" : "");
+        const route = import_types3.Routes.webhookExecute(this.id, this.token) + (wait ? "?wait=true" : "");
         const postOptions = opts.files?.length ? { body, files: opts.files, auth: false } : { body, auth: false };
         const data = await this.client.rest.post(
           route,
@@ -716,7 +736,7 @@ var init_Webhook = __esm({
        * @returns Webhook without token (cannot send)
        */
       static async fetch(client, webhookId) {
-        const data = await client.rest.get(import_types2.Routes.webhook(webhookId));
+        const data = await client.rest.get(import_types3.Routes.webhook(webhookId));
         return new _Webhook(client, data);
       }
       /**
@@ -746,12 +766,12 @@ var Invite_exports = {};
 __export(Invite_exports, {
   Invite: () => Invite
 });
-var import_types3, Invite;
+var import_types4, Invite;
 var init_Invite = __esm({
   "src/structures/Invite.ts"() {
     "use strict";
     init_Base();
-    import_types3 = require("@fluxerjs/types");
+    import_types4 = require("@fluxerjs/types");
     Invite = class extends Base {
       client;
       code;
@@ -801,7 +821,7 @@ var init_Invite = __esm({
        * Requires Manage Guild or Create Instant Invite permission.
        */
       async delete() {
-        await this.client.rest.delete(import_types3.Routes.invite(this.code), { auth: true });
+        await this.client.rest.delete(import_types4.Routes.invite(this.code), { auth: true });
       }
     };
   }
@@ -818,7 +838,7 @@ __export(Channel_exports, {
   TextChannel: () => TextChannel,
   VoiceChannel: () => VoiceChannel
 });
-var import_types4, import_util, Channel, GuildChannel, TextChannel, CategoryChannel, VoiceChannel, LinkChannel, DMChannel;
+var import_types5, import_util, Channel, GuildChannel, TextChannel, CategoryChannel, VoiceChannel, LinkChannel, DMChannel;
 var init_Channel = __esm({
   "src/structures/Channel.ts"() {
     "use strict";
@@ -826,7 +846,7 @@ var init_Channel = __esm({
     init_MessageCollector();
     init_Base();
     init_messageUtils();
-    import_types4 = require("@fluxerjs/types");
+    import_types5 = require("@fluxerjs/types");
     import_util = require("@fluxerjs/util");
     Channel = class _Channel extends Base {
       /** Whether this channel has a send method (TextChannel, DMChannel). */
@@ -835,7 +855,7 @@ var init_Channel = __esm({
       }
       /** Whether this channel is a DM or Group DM. */
       isDM() {
-        return this.type === import_types4.ChannelType.DM || this.type === import_types4.ChannelType.GroupDM;
+        return this.type === import_types5.ChannelType.DM || this.type === import_types5.ChannelType.GroupDM;
       }
       /** Whether this channel is voice-based (VoiceChannel). */
       isVoice() {
@@ -871,10 +891,10 @@ var init_Channel = __esm({
        */
       static from(client, data) {
         const type = data.type ?? 0;
-        if (type === import_types4.ChannelType.GuildText) return new TextChannel(client, data);
-        if (type === import_types4.ChannelType.GuildCategory) return new CategoryChannel(client, data);
-        if (type === import_types4.ChannelType.GuildVoice) return new VoiceChannel(client, data);
-        if (type === import_types4.ChannelType.GuildLink || type === import_types4.ChannelType.GuildLinkExtended)
+        if (type === import_types5.ChannelType.GuildText) return new TextChannel(client, data);
+        if (type === import_types5.ChannelType.GuildCategory) return new CategoryChannel(client, data);
+        if (type === import_types5.ChannelType.GuildVoice) return new VoiceChannel(client, data);
+        if (type === import_types5.ChannelType.GuildLink || type === import_types5.ChannelType.GuildLinkExtended)
           return new LinkChannel(client, data);
         return new GuildChannel(client, data);
       }
@@ -884,7 +904,7 @@ var init_Channel = __esm({
        */
       static fromOrCreate(client, data) {
         const type = data.type ?? 0;
-        if (type === import_types4.ChannelType.DM || type === import_types4.ChannelType.GroupDM)
+        if (type === import_types5.ChannelType.DM || type === import_types5.ChannelType.GroupDM)
           return _Channel.createDM(client, data);
         return _Channel.from(client, data);
       }
@@ -893,7 +913,7 @@ var init_Channel = __esm({
        * @param messageIds - Array of message IDs to delete (2–100)
        */
       async bulkDeleteMessages(messageIds) {
-        await this.client.rest.post(import_types4.Routes.channelBulkDelete(this.id), {
+        await this.client.rest.post(import_types5.Routes.channelBulkDelete(this.id), {
           body: { message_ids: messageIds },
           auth: true
         });
@@ -902,7 +922,7 @@ var init_Channel = __esm({
        * Send a typing indicator to the channel. Lasts ~10 seconds.
        */
       async sendTyping() {
-        await this.client.rest.post(import_types4.Routes.channelTyping(this.id), { auth: true });
+        await this.client.rest.post(import_types5.Routes.channelTyping(this.id), { auth: true });
       }
     };
     GuildChannel = class extends Channel {
@@ -927,7 +947,7 @@ var init_Channel = __esm({
        */
       async createWebhook(options) {
         const { Webhook: Webhook2 } = await Promise.resolve().then(() => (init_Webhook(), Webhook_exports));
-        const data = await this.client.rest.post(import_types4.Routes.channelWebhooks(this.id), {
+        const data = await this.client.rest.post(import_types5.Routes.channelWebhooks(this.id), {
           body: options,
           auth: true
         });
@@ -939,7 +959,7 @@ var init_Channel = __esm({
        */
       async fetchWebhooks() {
         const { Webhook: Webhook2 } = await Promise.resolve().then(() => (init_Webhook(), Webhook_exports));
-        const data = await this.client.rest.get(import_types4.Routes.channelWebhooks(this.id));
+        const data = await this.client.rest.get(import_types5.Routes.channelWebhooks(this.id));
         const list = Array.isArray(data) ? data : Object.values(data ?? {});
         return list.map((w) => new Webhook2(this.client, w));
       }
@@ -955,7 +975,7 @@ var init_Channel = __esm({
         if (options?.max_age != null) body.max_age = options.max_age;
         if (options?.unique != null) body.unique = options.unique;
         if (options?.temporary != null) body.temporary = options.temporary;
-        const data = await this.client.rest.post(import_types4.Routes.channelInvites(this.id), {
+        const data = await this.client.rest.post(import_types5.Routes.channelInvites(this.id), {
           body: Object.keys(body).length ? body : void 0,
           auth: true
         });
@@ -967,7 +987,7 @@ var init_Channel = __esm({
        */
       async fetchInvites() {
         const { Invite: Invite2 } = await Promise.resolve().then(() => (init_Invite(), Invite_exports));
-        const data = await this.client.rest.get(import_types4.Routes.channelInvites(this.id));
+        const data = await this.client.rest.get(import_types5.Routes.channelInvites(this.id));
         const list = Array.isArray(data) ? data : Object.values(data ?? {});
         return list.map((i) => new Invite2(this.client, i));
       }
@@ -993,7 +1013,7 @@ var init_Channel = __esm({
         const body = buildSendBody(options);
         const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
         const postOptions = opts.files?.length ? { body, files: opts.files } : { body };
-        const data = await this.client.rest.post(import_types4.Routes.channelMessages(this.id), postOptions);
+        const data = await this.client.rest.post(import_types5.Routes.channelMessages(this.id), postOptions);
         return new Message2(this.client, data);
       }
       /** Message manager for this channel. Use channel.messages.fetch(messageId). */
@@ -1018,7 +1038,7 @@ var init_Channel = __esm({
        */
       async fetchPinnedMessages() {
         const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
-        const data = await this.client.rest.get(import_types4.Routes.channelPins(this.id));
+        const data = await this.client.rest.get(import_types5.Routes.channelPins(this.id));
         const list = Array.isArray(data) ? data : data?.items ?? [];
         return list.map((item) => {
           const msg = typeof item === "object" && item && "message" in item ? item.message : item;
@@ -1085,7 +1105,7 @@ var init_Channel = __esm({
         const body = buildSendBody(options);
         const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
         const postOptions = opts.files?.length ? { body, files: opts.files } : { body };
-        const data = await this.client.rest.post(import_types4.Routes.channelMessages(this.id), postOptions);
+        const data = await this.client.rest.post(import_types5.Routes.channelMessages(this.id), postOptions);
         return new Message2(this.client, data);
       }
       /** Message manager for this channel. Use channel.messages.fetch(messageId). */
@@ -1105,7 +1125,7 @@ var init_Channel = __esm({
        */
       async fetchPinnedMessages() {
         const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
-        const data = await this.client.rest.get(import_types4.Routes.channelPins(this.id));
+        const data = await this.client.rest.get(import_types5.Routes.channelPins(this.id));
         const list = Array.isArray(data) ? data : data?.items ?? [];
         return list.map((item) => {
           const msg = typeof item === "object" && item && "message" in item ? item.message : item;
@@ -1129,12 +1149,56 @@ var init_Channel = __esm({
   }
 });
 
+// src/client/GuildMemberManager.ts
+var import_collection5, GuildMemberManager;
+var init_GuildMemberManager = __esm({
+  "src/client/GuildMemberManager.ts"() {
+    "use strict";
+    import_collection5 = require("@fluxerjs/collection");
+    GuildMemberManager = class extends import_collection5.Collection {
+      constructor(guild) {
+        super();
+        this.guild = guild;
+      }
+      /**
+       * 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.
+       * Use fetchMe() to load the bot's member when not cached.
+       *
+       * @example
+       * const perms = guild.members.me?.permissions;
+       * if (perms?.has(PermissionFlags.BanMembers)) { ... }
+       */
+      get me() {
+        const userId = this.guild.client.user?.id;
+        return userId ? this.get(userId) ?? null : null;
+      }
+      /**
+       * Fetch the current bot user as a GuildMember in this guild.
+       * Caches the result in guild.members.
+       *
+       * @throws Error if client.user is null (client not ready)
+       * @example
+       * const me = await guild.members.fetchMe();
+       * console.log(me.displayName);
+       */
+      async fetchMe() {
+        const userId = this.guild.client.user?.id;
+        if (!userId) {
+          throw new Error("Cannot fetch me: client.user is null (client not ready)");
+        }
+        return this.guild.fetchMember(userId);
+      }
+    };
+  }
+});
+
 // src/util/permissions.ts
 function computePermissions(basePermissions, overwrites, memberRoles, memberId, isOwner) {
   if (isOwner) return import_util3.ALL_PERMISSIONS_BIGINT;
   let perms = basePermissions;
   for (const overwrite of overwrites ?? []) {
-    const applies = overwrite.type === import_types6.OverwriteType.Role && memberRoles.includes(overwrite.id) || overwrite.type === import_types6.OverwriteType.Member && overwrite.id === memberId;
+    const applies = overwrite.type === import_types7.OverwriteType.Role && memberRoles.includes(overwrite.id) || overwrite.type === import_types7.OverwriteType.Member && overwrite.id === memberId;
     if (!applies) continue;
     const allow = BigInt(overwrite.allow || "0");
     const deny = BigInt(overwrite.deny || "0");
@@ -1147,11 +1211,11 @@ function hasPermission(bitfield, permission) {
   if ((bitfield & Administrator) !== 0n) return true;
   return (bitfield & permission) === permission;
 }
-var import_types6, import_util3;
+var import_types7, import_util3;
 var init_permissions = __esm({
   "src/util/permissions.ts"() {
     "use strict";
-    import_types6 = require("@fluxerjs/types");
+    import_types7 = require("@fluxerjs/types");
     import_util3 = require("@fluxerjs/util");
   }
 });
@@ -1161,13 +1225,13 @@ var GuildMember_exports = {};
 __export(GuildMember_exports, {
   GuildMember: () => GuildMember
 });
-var import_util4, import_types7, GuildMember;
+var import_util4, import_types8, GuildMember;
 var init_GuildMember = __esm({
   "src/structures/GuildMember.ts"() {
     "use strict";
     init_Base();
     import_util4 = require("@fluxerjs/util");
-    import_types7 = require("@fluxerjs/types");
+    import_types8 = require("@fluxerjs/types");
     init_cdn();
     init_permissions();
     GuildMember = class extends Base {
@@ -1234,7 +1298,7 @@ var init_GuildMember = __esm({
        * Requires Manage Roles permission.
        */
       async addRole(roleId) {
-        await this.client.rest.put(import_types7.Routes.guildMemberRole(this.guild.id, this.id, roleId));
+        await this.client.rest.put(import_types8.Routes.guildMemberRole(this.guild.id, this.id, roleId));
       }
       /**
        * Remove a role from this member.
@@ -1242,7 +1306,7 @@ var init_GuildMember = __esm({
        * Requires Manage Roles permission.
        */
       async removeRole(roleId) {
-        await this.client.rest.delete(import_types7.Routes.guildMemberRole(this.guild.id, this.id, roleId));
+        await this.client.rest.delete(import_types8.Routes.guildMemberRole(this.guild.id, this.id, roleId));
       }
       /**
        * Get the member's guild-level permissions (from roles only, no channel overwrites).
@@ -1313,11 +1377,12 @@ var Role_exports = {};
 __export(Role_exports, {
   Role: () => Role
 });
-var import_util5, Role;
+var import_types9, import_util5, Role;
 var init_Role = __esm({
   "src/structures/Role.ts"() {
     "use strict";
     init_Base();
+    import_types9 = require("@fluxerjs/types");
     import_util5 = require("@fluxerjs/util");
     Role = class extends Base {
       client;
@@ -1349,6 +1414,17 @@ var init_Role = __esm({
         this.unicodeEmoji = data.unicode_emoji ?? null;
         this.hoistPosition = data.hoist_position ?? null;
       }
+      /** 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.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;
+        if (data.hoist_position !== void 0) this.hoistPosition = data.hoist_position ?? null;
+      }
       /** Returns a mention string (e.g. `<@&123456>`). */
       toString() {
         return `<@&${this.id}>`;
@@ -1371,6 +1447,42 @@ var init_Role = __esm({
         if ((rolePerms & BigInt(import_util5.PermissionFlags.Administrator)) !== 0n) return true;
         return (rolePerms & permBig) === permBig;
       }
+      /**
+       * Edit this role.
+       * Requires Manage Roles permission.
+       * @param options - Role updates (permissions accepts PermissionResolvable for convenience)
+       * @returns This role (updated in place)
+       * @example
+       * await role.edit({ name: 'Moderator', permissions: ['BanMembers', 'KickMembers'] });
+       */
+      async edit(options) {
+        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);
+        }
+        if (options.color !== void 0) body.color = options.color;
+        if (options.hoist !== void 0) body.hoist = options.hoist;
+        if (options.mentionable !== void 0) body.mentionable = options.mentionable;
+        if (options.unicode_emoji !== void 0) body.unicode_emoji = options.unicode_emoji;
+        if (options.position !== void 0) body.position = options.position;
+        if (options.hoist_position !== void 0) body.hoist_position = options.hoist_position;
+        const data = await this.client.rest.patch(import_types9.Routes.guildRole(this.guildId, this.id), {
+          body: Object.keys(body).length ? body : void 0,
+          auth: true
+        });
+        this._patch(data);
+        return this;
+      }
+      /**
+       * Delete this role.
+       * Requires Manage Roles permission.
+       */
+      async delete() {
+        await this.client.rest.delete(import_types9.Routes.guildRole(this.guildId, this.id), { auth: true });
+        const guild = this.client.guilds.get(this.guildId);
+        if (guild) guild.roles.delete(this.id);
+      }
     };
   }
 });
@@ -1380,12 +1492,12 @@ var GuildBan_exports = {};
 __export(GuildBan_exports, {
   GuildBan: () => GuildBan
 });
-var import_types8, GuildBan;
+var import_types10, GuildBan;
 var init_GuildBan = __esm({
   "src/structures/GuildBan.ts"() {
     "use strict";
     init_Base();
-    import_types8 = require("@fluxerjs/types");
+    import_types10 = require("@fluxerjs/types");
     GuildBan = class extends Base {
       client;
       guildId;
@@ -1407,7 +1519,7 @@ var init_GuildBan = __esm({
        * Requires Ban Members permission.
        */
       async unban() {
-        await this.client.rest.delete(import_types8.Routes.guildBan(this.guildId, this.user.id), {
+        await this.client.rest.delete(import_types10.Routes.guildBan(this.guildId, this.user.id), {
           auth: true
         });
       }
@@ -1420,20 +1532,21 @@ var Guild_exports = {};
 __export(Guild_exports, {
   Guild: () => Guild
 });
-var import_util6, import_rest2, import_collection5, import_types9, Guild;
+var import_util6, import_rest3, import_collection6, import_types11, Guild;
 var init_Guild = __esm({
   "src/structures/Guild.ts"() {
     "use strict";
     import_util6 = require("@fluxerjs/util");
-    import_rest2 = require("@fluxerjs/rest");
+    import_rest3 = require("@fluxerjs/rest");
+    import_collection6 = require("@fluxerjs/collection");
     init_Base();
     init_FluxerError();
     init_ErrorCodes();
-    import_collection5 = require("@fluxerjs/collection");
+    init_GuildMemberManager();
     init_GuildMember();
     init_Role();
     init_Constants();
-    import_types9 = require("@fluxerjs/types");
+    import_types11 = require("@fluxerjs/types");
     Guild = class extends Base {
       client;
       id;
@@ -1468,14 +1581,15 @@ var init_Guild = __esm({
       splashWidth;
       /** Splash image height. Optional. */
       splashHeight;
-      members = new import_collection5.Collection();
-      channels = new import_collection5.Collection();
-      roles = new import_collection5.Collection();
+      members;
+      channels = new import_collection6.Collection();
+      roles = new import_collection6.Collection();
       /** @param data - API guild from GET /guilds/{id} or gateway GUILD_CREATE */
       constructor(client, data) {
         super();
         this.client = client;
         this.id = data.id;
+        this.members = new GuildMemberManager(this);
         this.name = data.name;
         this.icon = data.icon ?? null;
         this.banner = data.banner ?? null;
@@ -1525,7 +1639,7 @@ var init_Guild = __esm({
        * Requires Manage Roles permission.
        */
       async addRoleToMember(userId, roleId) {
-        await this.client.rest.put(import_types9.Routes.guildMemberRole(this.id, userId, roleId));
+        await this.client.rest.put(import_types11.Routes.guildMemberRole(this.id, userId, roleId));
       }
       /**
        * Remove a role from a member by user ID. Does not require fetching the member first.
@@ -1534,7 +1648,75 @@ var init_Guild = __esm({
        * Requires Manage Roles permission.
        */
       async removeRoleFromMember(userId, roleId) {
-        await this.client.rest.delete(import_types9.Routes.guildMemberRole(this.id, userId, roleId));
+        await this.client.rest.delete(import_types11.Routes.guildMemberRole(this.id, userId, roleId));
+      }
+      /**
+       * Create a role in this guild.
+       * Requires Manage Roles permission.
+       * @param options - Role data (permissions accepts PermissionResolvable for convenience)
+       * @returns The created role
+       * @example
+       * const role = await guild.createRole({ name: 'Mod', permissions: ['KickMembers', 'BanMembers'] });
+       */
+      async createRole(options) {
+        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);
+        }
+        if (options.color !== void 0) body.color = options.color;
+        if (options.hoist !== void 0) body.hoist = options.hoist;
+        if (options.mentionable !== void 0) body.mentionable = options.mentionable;
+        if (options.unicode_emoji !== void 0) body.unicode_emoji = options.unicode_emoji;
+        if (options.position !== void 0) body.position = options.position;
+        if (options.hoist_position !== void 0) body.hoist_position = options.hoist_position;
+        const data = await this.client.rest.post(import_types11.Routes.guildRoles(this.id), {
+          body: Object.keys(body).length ? body : void 0,
+          auth: true
+        });
+        const role = new Role(this.client, data, this.id);
+        this.roles.set(role.id, role);
+        return role;
+      }
+      /**
+       * Fetch all roles in this guild.
+       * @returns Array of Role objects (cached in guild.roles)
+       */
+      async fetchRoles() {
+        const data = await this.client.rest.get(
+          import_types11.Routes.guildRoles(this.id)
+        );
+        const list = Array.isArray(data) ? data : Object.values(data ?? {});
+        const roles = [];
+        for (const r of list) {
+          const role = new Role(this.client, r, this.id);
+          this.roles.set(role.id, role);
+          roles.push(role);
+        }
+        return roles;
+      }
+      /**
+       * Fetch a role by ID.
+       * @param roleId - The role ID to fetch
+       * @returns The role
+       * @throws FluxerError with ROLE_NOT_FOUND if role does not exist (404)
+       */
+      async fetchRole(roleId) {
+        try {
+          const data = await this.client.rest.get(import_types11.Routes.guildRole(this.id, roleId));
+          const role = new Role(this.client, data, this.id);
+          this.roles.set(role.id, role);
+          return role;
+        } catch (err) {
+          const statusCode = err instanceof import_rest3.FluxerAPIError ? err.statusCode : err?.statusCode;
+          if (statusCode === 404) {
+            throw new FluxerError(`Role ${roleId} not found in guild`, {
+              code: ErrorCodes.RoleNotFound,
+              cause: err
+            });
+          }
+          throw err instanceof FluxerError ? err : new FluxerError("Failed to fetch guild role", { cause: err });
+        }
       }
       /**
        * Resolve a role ID from an argument (role mention, raw ID, or name).
@@ -1550,7 +1732,7 @@ var init_Guild = __esm({
           (r) => !!(r.name && r.name.toLowerCase() === arg.trim().toLowerCase())
         );
         if (cached) return cached.id;
-        const roles = await this.client.rest.get(import_types9.Routes.guildRoles(this.id));
+        const roles = await this.client.rest.get(import_types11.Routes.guildRoles(this.id));
         const list = Array.isArray(roles) ? roles : Object.values(roles ?? {});
         const role = list.find((r) => !!(r.name && r.name.toLowerCase() === arg.trim().toLowerCase()));
         if (role) {
@@ -1573,7 +1755,7 @@ var init_Guild = __esm({
           body.delete_message_days = options.delete_message_days;
         if (options?.ban_duration_seconds != null)
           body.ban_duration_seconds = options.ban_duration_seconds;
-        await this.client.rest.put(import_types9.Routes.guildBan(this.id, userId), {
+        await this.client.rest.put(import_types11.Routes.guildBan(this.id, userId), {
           body: Object.keys(body).length ? body : void 0,
           auth: true
         });
@@ -1584,7 +1766,7 @@ var init_Guild = __esm({
        */
       async fetchBans() {
         const { GuildBan: GuildBan2 } = await Promise.resolve().then(() => (init_GuildBan(), GuildBan_exports));
-        const data = await this.client.rest.get(import_types9.Routes.guildBans(this.id));
+        const data = await this.client.rest.get(import_types11.Routes.guildBans(this.id));
         const list = Array.isArray(data) ? data : data?.bans ?? [];
         return list.map((b) => new GuildBan2(this.client, { ...b, guild_id: this.id }, this.id));
       }
@@ -1594,7 +1776,7 @@ var init_Guild = __esm({
        * Requires Ban Members permission.
        */
       async unban(userId) {
-        await this.client.rest.delete(import_types9.Routes.guildBan(this.id, userId), { auth: true });
+        await this.client.rest.delete(import_types11.Routes.guildBan(this.id, userId), { auth: true });
       }
       /**
        * Kick a member from this guild.
@@ -1602,7 +1784,7 @@ var init_Guild = __esm({
        * Requires Kick Members permission.
        */
       async kick(userId) {
-        await this.client.rest.delete(import_types9.Routes.guildMember(this.id, userId), { auth: true });
+        await this.client.rest.delete(import_types11.Routes.guildMember(this.id, userId), { auth: true });
       }
       /**
        * Fetch a guild member by user ID.
@@ -1614,13 +1796,13 @@ var init_Guild = __esm({
       async fetchMember(userId) {
         try {
           const data = await this.client.rest.get(
-            import_types9.Routes.guildMember(this.id, userId)
+            import_types11.Routes.guildMember(this.id, userId)
           );
           const member = new GuildMember(this.client, { ...data, guild_id: this.id }, this);
           this.members.set(member.id, member);
           return member;
         } catch (err) {
-          const statusCode = err instanceof import_rest2.FluxerAPIError ? err.statusCode : err?.statusCode;
+          const statusCode = err instanceof import_rest3.FluxerAPIError ? err.statusCode : err?.statusCode;
           if (statusCode === 404) {
             throw new FluxerError(`Member ${userId} not found in guild`, {
               code: ErrorCodes.MemberNotFound,
@@ -1642,13 +1824,13 @@ var init_Guild = __esm({
         if (options?.userId) params.set("user_id", options.userId);
         if (options?.actionType != null) params.set("action_type", String(options.actionType));
         const qs = params.toString();
-        const url = import_types9.Routes.guildAuditLogs(this.id) + (qs ? `?${qs}` : "");
+        const url = import_types11.Routes.guildAuditLogs(this.id) + (qs ? `?${qs}` : "");
         return this.client.rest.get(url);
       }
       /** Fetch all webhooks in this guild. Returned webhooks do not include the token (cannot send). */
       async fetchWebhooks() {
         const { Webhook: Webhook2 } = await Promise.resolve().then(() => (init_Webhook(), Webhook_exports));
-        const data = await this.client.rest.get(import_types9.Routes.guildWebhooks(this.id));
+        const data = await this.client.rest.get(import_types11.Routes.guildWebhooks(this.id));
         const list = Array.isArray(data) ? data : Object.values(data ?? {});
         return list.map((w) => new Webhook2(this.client, w));
       }
@@ -1659,7 +1841,7 @@ var init_Guild = __esm({
        */
       async createChannel(data) {
         const { Channel: Channel2 } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
-        const created = await this.client.rest.post(import_types9.Routes.guildChannels(this.id), {
+        const created = await this.client.rest.post(import_types11.Routes.guildChannels(this.id), {
           body: data,
           auth: true
         });
@@ -1676,7 +1858,7 @@ var init_Guild = __esm({
        */
       async fetchChannels() {
         const { Channel: Channel2 } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
-        const data = await this.client.rest.get(import_types9.Routes.guildChannels(this.id));
+        const data = await this.client.rest.get(import_types11.Routes.guildChannels(this.id));
         const list = Array.isArray(data) ? data : Object.values(data ?? {});
         const channels = [];
         for (const ch of list) {
@@ -1695,7 +1877,7 @@ var init_Guild = __esm({
        * Requires Manage Channels permission.
        */
       async setChannelPositions(updates) {
-        await this.client.rest.patch(import_types9.Routes.guildChannels(this.id), {
+        await this.client.rest.patch(import_types11.Routes.guildChannels(this.id), {
           body: updates,
           auth: true
         });
@@ -1705,12 +1887,12 @@ var init_Guild = __esm({
 });
 
 // src/structures/User.ts
-var import_types11, User;
+var import_types13, User;
 var init_User = __esm({
   "src/structures/User.ts"() {
     "use strict";
     init_Base();
-    import_types11 = require("@fluxerjs/types");
+    import_types13 = require("@fluxerjs/types");
     init_Constants();
     User = class extends Base {
       client;
@@ -1788,7 +1970,7 @@ var init_User = __esm({
        */
       async createDM() {
         const { DMChannel: DMChannelClass } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
-        const data = await this.client.rest.post(import_types11.Routes.userMeChannels(), {
+        const data = await this.client.rest.post(import_types13.Routes.userMeChannels(), {
           body: { recipient_id: this.id },
           auth: true
         });
@@ -1811,10 +1993,14 @@ var MessageReaction_exports = {};
 __export(MessageReaction_exports, {
   MessageReaction: () => MessageReaction
 });
-var MessageReaction;
+var import_types15, import_rest4, MessageReaction;
 var init_MessageReaction = __esm({
   "src/structures/MessageReaction.ts"() {
     "use strict";
+    import_types15 = require("@fluxerjs/types");
+    import_rest4 = require("@fluxerjs/rest");
+    init_FluxerError();
+    init_ErrorCodes();
     init_Base();
     MessageReaction = class extends Base {
       client;
@@ -1847,7 +2033,22 @@ var init_MessageReaction = __esm({
        * @throws FluxerError with MESSAGE_NOT_FOUND if the message does not exist
        */
       async fetchMessage() {
-        return this.client.channels.fetchMessage(this.channelId, this.messageId);
+        try {
+          const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
+          const data = await this.client.rest.get(
+            import_types15.Routes.channelMessage(this.channelId, this.messageId)
+          );
+          return new Message2(this.client, data);
+        } catch (err) {
+          if (err instanceof import_rest4.RateLimitError) throw err;
+          if (err instanceof import_rest4.FluxerAPIError && err.statusCode === 404) {
+            throw new FluxerError(`Message ${this.messageId} not found in channel ${this.channelId}`, {
+              code: ErrorCodes.MessageNotFound,
+              cause: err
+            });
+          }
+          throw err instanceof FluxerError ? err : new FluxerError(String(err), { cause: err });
+        }
       }
     };
   }
@@ -1858,12 +2059,12 @@ var ClientUser_exports = {};
 __export(ClientUser_exports, {
   ClientUser: () => ClientUser
 });
-var import_types12, ClientUser;
+var import_types16, ClientUser;
 var init_ClientUser = __esm({
   "src/client/ClientUser.ts"() {
     "use strict";
     init_User();
-    import_types12 = require("@fluxerjs/types");
+    import_types16 = require("@fluxerjs/types");
     ClientUser = class extends User {
       constructor(client, data) {
         super(client, { ...data });
@@ -1874,7 +2075,7 @@ var init_ClientUser = __esm({
        */
       async fetchGuilds() {
         const { Guild: Guild2 } = await Promise.resolve().then(() => (init_Guild(), Guild_exports));
-        const data = await this.client.rest.get(import_types12.Routes.currentUserGuilds());
+        const data = await this.client.rest.get(import_types16.Routes.currentUserGuilds());
         const list = Array.isArray(data) ? data : data?.guilds ?? [];
         const guilds = [];
         for (const g of list) {
@@ -1889,7 +2090,7 @@ var init_ClientUser = __esm({
        * @param guildId - The guild ID to leave
        */
       async leaveGuild(guildId) {
-        await this.client.rest.delete(import_types12.Routes.leaveGuild(guildId), { auth: true });
+        await this.client.rest.delete(import_types16.Routes.leaveGuild(guildId), { auth: true });
         this.client.guilds.delete(guildId);
       }
     };
@@ -1911,17 +2112,18 @@ __export(index_exports, {
   ErrorCodes: () => ErrorCodes,
   Events: () => Events,
   FluxerError: () => FluxerError,
-  GatewayOpcodes: () => import_types16.GatewayOpcodes,
+  GatewayOpcodes: () => import_types20.GatewayOpcodes,
   Guild: () => Guild,
   GuildBan: () => GuildBan,
   GuildChannel: () => GuildChannel,
   GuildEmoji: () => GuildEmoji,
   GuildMember: () => GuildMember,
+  GuildMemberManager: () => GuildMemberManager,
   GuildSticker: () => GuildSticker,
   Invite: () => Invite,
   LinkChannel: () => LinkChannel,
   Message: () => Message,
-  MessageAttachmentFlags: () => import_types16.MessageAttachmentFlags,
+  MessageAttachmentFlags: () => import_types20.MessageAttachmentFlags,
   MessageCollector: () => MessageCollector,
   MessageManager: () => MessageManager,
   MessagePayload: () => import_builders3.MessagePayload,
@@ -1930,9 +2132,12 @@ __export(index_exports, {
   PermissionsBitField: () => import_util9.PermissionsBitField,
   ReactionCollector: () => ReactionCollector,
   Role: () => Role,
-  Routes: () => import_types16.Routes,
+  Routes: () => import_types20.Routes,
   TextChannel: () => TextChannel,
   User: () => User,
+  UserFlagsBitField: () => import_util9.UserFlagsBitField,
+  UserFlagsBits: () => import_util9.UserFlagsBits,
+  UsersManager: () => UsersManager,
   VoiceChannel: () => VoiceChannel,
   Webhook: () => Webhook,
   cdnAvatarURL: () => cdnAvatarURL,
@@ -1941,22 +2146,22 @@ __export(index_exports, {
   cdnDisplayAvatarURL: () => cdnDisplayAvatarURL,
   cdnMemberAvatarURL: () => cdnMemberAvatarURL,
   cdnMemberBannerURL: () => cdnMemberBannerURL,
+  resolvePermissionsToBitfield: () => import_util9.resolvePermissionsToBitfield,
   resolveTenorToImageUrl: () => import_util8.resolveTenorToImageUrl
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/client/Client.ts
 var import_events3 = require("events");
-var import_rest3 = require("@fluxerjs/rest");
+var import_rest5 = require("@fluxerjs/rest");
 var import_ws = require("@fluxerjs/ws");
-var import_types13 = require("@fluxerjs/types");
-var import_collection7 = require("@fluxerjs/collection");
+var import_types17 = require("@fluxerjs/types");
 
 // src/client/ChannelManager.ts
 var import_collection4 = require("@fluxerjs/collection");
-var import_types5 = require("@fluxerjs/types");
+var import_types6 = require("@fluxerjs/types");
 var import_util2 = require("@fluxerjs/util");
-var import_rest = require("@fluxerjs/rest");
+var import_rest2 = require("@fluxerjs/rest");
 init_FluxerError();
 init_ErrorCodes();
 init_messageUtils();
@@ -1980,7 +2185,7 @@ var ChannelManager = class extends import_collection4.Collection {
     try {
       const { Channel: Channel2 } = await Promise.resolve().then(() => (init_Channel(), Channel_exports));
       const data = await this.client.rest.get(
-        import_types5.Routes.channel(channelId)
+        import_types6.Routes.channel(channelId)
       );
       const channel = Channel2.fromOrCreate(this.client, data);
       if (!channel) {
@@ -1991,8 +2196,8 @@ var ChannelManager = class extends import_collection4.Collection {
       this.set(channel.id, channel);
       return channel;
     } catch (err) {
-      if (err instanceof import_rest.RateLimitError) throw err;
-      if (err instanceof import_rest.FluxerAPIError && err.statusCode === 404) {
+      if (err instanceof import_rest2.RateLimitError) throw err;
+      if (err instanceof import_rest2.FluxerAPIError && err.statusCode === 404) {
         throw new FluxerError(`Channel ${channelId} not found`, {
           code: ErrorCodes.ChannelNotFound,
           cause: err
@@ -2020,12 +2225,12 @@ var ChannelManager = class extends import_collection4.Collection {
     try {
       const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
       const data = await this.client.rest.get(
-        import_types5.Routes.channelMessage(channelId, messageId)
+        import_types6.Routes.channelMessage(channelId, messageId)
       );
       return new Message2(this.client, data);
     } catch (err) {
-      if (err instanceof import_rest.RateLimitError) throw err;
-      if (err instanceof import_rest.FluxerAPIError && err.statusCode === 404) {
+      if (err instanceof import_rest2.RateLimitError) throw err;
+      if (err instanceof import_rest2.FluxerAPIError && err.statusCode === 404) {
         throw new FluxerError(`Message ${messageId} not found in channel ${channelId}`, {
           code: ErrorCodes.MessageNotFound,
           cause: err
@@ -2050,15 +2255,15 @@ var ChannelManager = class extends import_collection4.Collection {
     const body = buildSendBody(payload);
     const { Message: Message2 } = await Promise.resolve().then(() => (init_Message(), Message_exports));
     const postOptions = opts.files?.length ? { body, files: opts.files } : { body };
-    const data = await this.client.rest.post(import_types5.Routes.channelMessages(channelId), postOptions);
+    const data = await this.client.rest.post(import_types6.Routes.channelMessages(channelId), postOptions);
     return new Message2(this.client, data);
   }
 };
 
 // src/client/GuildManager.ts
-var import_collection6 = require("@fluxerjs/collection");
-var import_types10 = require("@fluxerjs/types");
-var GuildManager = class extends import_collection6.Collection {
+var import_collection7 = require("@fluxerjs/collection");
+var import_types12 = require("@fluxerjs/types");
+var GuildManager = class extends import_collection7.Collection {
   constructor(client) {
     super();
     this.client = client;
@@ -2077,7 +2282,7 @@ var GuildManager = class extends import_collection6.Collection {
     try {
       const { Guild: Guild2 } = await Promise.resolve().then(() => (init_Guild(), Guild_exports));
       const data = await this.client.rest.get(
-        import_types10.Routes.guild(guildId)
+        import_types12.Routes.guild(guildId)
       );
       const guild = new Guild2(this.client, data);
       this.set(guild.id, guild);
@@ -2095,6 +2300,77 @@ init_Events();
 var import_util7 = require("@fluxerjs/util");
 init_User();
 
+// src/client/UsersManager.ts
+var import_collection8 = require("@fluxerjs/collection");
+var import_types14 = require("@fluxerjs/types");
+init_GuildMember();
+var UsersManager = class extends import_collection8.Collection {
+  constructor(client) {
+    super();
+    this.client = client;
+  }
+  /**
+   * Fetch a user by ID from the API.
+   * Updates cache if user already exists.
+   * @param userId - Snowflake of the user
+   * @returns The user
+   * @throws FluxerError (or REST error) if user not found
+   * @example
+   * const user = await client.users.fetch(userId);
+   * console.log(user.username);
+   */
+  async fetch(userId) {
+    const data = await this.client.rest.get(import_types14.Routes.user(userId));
+    return this.client.getOrCreateUser(data);
+  }
+  /**
+   * Fetch a user with full profile and optional guild context.
+   * Returns user, global profile, server profile (when guildId), and member (when guildId).
+   * Ideal for userinfo commands.
+   * @param userId - Snowflake of the user
+   * @param options - Optional guildId for server profile and member data
+   * @returns User, raw data, profiles, and member (when in guild)
+   * @throws FluxerError (or REST error) if user not found
+   * @example
+   * const { user, globalProfile, serverProfile, member } = await client.users.fetchWithProfile(
+   *   userId,
+   *   { guildId: message.guildId ?? undefined },
+   * );
+   */
+  async fetchWithProfile(userId, options) {
+    const guildId = options?.guildId ?? void 0;
+    const [userData, globalProfileData, serverProfileData, memberData] = await Promise.all([
+      this.client.rest.get(import_types14.Routes.user(userId)),
+      this.client.rest.get(import_types14.Routes.userProfile(userId)).catch(() => null),
+      guildId ? this.client.rest.get(import_types14.Routes.userProfile(userId, guildId)).catch(() => null) : Promise.resolve(null),
+      guildId ? this.client.rest.get(import_types14.Routes.guildMember(guildId, userId)).catch(() => null) : Promise.resolve(null)
+    ]);
+    const user = this.client.getOrCreateUser(userData);
+    const globalProfile = globalProfileData && typeof globalProfileData === "object" ? globalProfileData : null;
+    const serverProfile = serverProfileData && typeof serverProfileData === "object" ? serverProfileData : null;
+    let member = null;
+    if (memberData && guildId) {
+      const guild = this.client.guilds.get(guildId) ?? await this.client.guilds.fetch(guildId);
+      if (guild) {
+        member = new GuildMember(
+          this.client,
+          { ...memberData, guild_id: guildId },
+          guild
+        );
+        guild.members.set(member.id, member);
+      }
+    }
+    return {
+      user,
+      userData,
+      globalProfile,
+      serverProfile,
+      member,
+      memberData
+    };
+  }
+};
+
 // src/client/EventHandlerRegistry.ts
 init_Events();
 var handlers = /* @__PURE__ */ new Map();
@@ -2310,8 +2586,13 @@ handlers.set("GUILD_ROLE_UPDATE", async (client, d) => {
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (guild) {
-    const { Role: Role2 } = await Promise.resolve().then(() => (init_Role(), Role_exports));
-    guild.roles.set(data.role.id, new Role2(client, data.role, guild.id));
+    const existing = guild.roles.get(data.role.id);
+    if (existing) {
+      existing._patch(data.role);
+    } else {
+      const { Role: Role2 } = await Promise.resolve().then(() => (init_Role(), Role_exports));
+      guild.roles.set(data.role.id, new Role2(client, data.role, guild.id));
+    }
   }
   client.emit(Events.GuildRoleUpdate, data);
 });
@@ -2388,7 +2669,11 @@ var Client = class extends import_events3.EventEmitter {
       get: () => this.guilds,
       configurable: true
     });
-    this.rest = new import_rest3.REST({
+    Object.defineProperty(this.users, "cache", {
+      get: () => this.users,
+      configurable: true
+    });
+    this.rest = new import_rest5.REST({
       api: options.rest?.api ?? "https://api.fluxer.app",
       version: options.rest?.version ?? "1",
       ...options.rest
@@ -2397,7 +2682,7 @@ var Client = class extends import_events3.EventEmitter {
   rest;
   guilds = new GuildManager(this);
   channels = new ChannelManager(this);
-  users = new import_collection7.Collection();
+  users = new UsersManager(this);
   /** Typed event handlers. Use client.events.MessageReactionAdd((reaction, user, messageId, channelId, emoji, userId) => {...}) or client.on(Events.MessageReactionAdd, ...). */
   events;
   /** The authenticated bot user. Null until READY is received. */
@@ -2417,11 +2702,14 @@ var Client = class extends import_events3.EventEmitter {
     if (typeof emoji === "object" && emoji.id) {
       return (0, import_util7.formatEmoji)({ name: emoji.name, id: emoji.id, animated: emoji.animated });
     }
-    const parsed = (0, import_util7.parseEmoji)(typeof emoji === "string" ? emoji : `:${emoji.name}:`);
+    const parsed = (0, import_util7.parseEmoji)(
+      typeof emoji === "string" ? emoji : emoji.id ? `:${emoji.name}:` : emoji.name
+    );
     if (!parsed) throw new Error("Invalid emoji");
     if (parsed.id) return (0, import_util7.formatEmoji)(parsed);
+    if (!/^\w+$/.test(parsed.name)) return encodeURIComponent(parsed.name);
     if (guildId) {
-      const emojis = await this.rest.get(import_types13.Routes.guildEmojis(guildId));
+      const emojis = await this.rest.get(import_types17.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 });
@@ -2588,11 +2876,12 @@ var Client = class extends import_events3.EventEmitter {
     return this.readyAt !== null && this.user !== null;
   }
   static get Routes() {
-    return import_types13.Routes;
+    return import_types17.Routes;
   }
 };
 
 // src/index.ts
+init_GuildMemberManager();
 init_MessageManager();
 init_ClientUser();
 init_Base();
@@ -2609,7 +2898,7 @@ init_GuildBan();
 
 // src/structures/GuildEmoji.ts
 init_Base();
-var import_types14 = require("@fluxerjs/types");
+var import_types18 = require("@fluxerjs/types");
 init_Constants();
 var GuildEmoji = class extends Base {
   client;
@@ -2637,7 +2926,7 @@ var GuildEmoji = class extends Base {
   }
   /** Delete this emoji. Requires Manage Emojis and Stickers permission. */
   async delete() {
-    await this.client.rest.delete(import_types14.Routes.guildEmoji(this.guildId, this.id), {
+    await this.client.rest.delete(import_types18.Routes.guildEmoji(this.guildId, this.id), {
       auth: true
     });
   }
@@ -2646,7 +2935,7 @@ var GuildEmoji = class extends Base {
    * Requires Manage Emojis and Stickers permission.
    */
   async edit(options) {
-    const data = await this.client.rest.patch(import_types14.Routes.guildEmoji(this.guildId, this.id), {
+    const data = await this.client.rest.patch(import_types18.Routes.guildEmoji(this.guildId, this.id), {
       body: options,
       auth: true
     });
@@ -2657,7 +2946,7 @@ var GuildEmoji = class extends Base {
 
 // src/structures/GuildSticker.ts
 init_Base();
-var import_types15 = require("@fluxerjs/types");
+var import_types19 = require("@fluxerjs/types");
 init_Constants();
 var GuildSticker = class extends Base {
   client;
@@ -2685,7 +2974,7 @@ var GuildSticker = class extends Base {
   }
   /** Delete this sticker. Requires Manage Emojis and Stickers permission. */
   async delete() {
-    await this.client.rest.delete(import_types15.Routes.guildSticker(this.guildId, this.id), {
+    await this.client.rest.delete(import_types19.Routes.guildSticker(this.guildId, this.id), {
       auth: true
     });
   }
@@ -2694,7 +2983,7 @@ var GuildSticker = class extends Base {
    * Requires Manage Emojis and Stickers permission.
    */
   async edit(options) {
-    const data = await this.client.rest.patch(import_types15.Routes.guildSticker(this.guildId, this.id), {
+    const data = await this.client.rest.patch(import_types19.Routes.guildSticker(this.guildId, this.id), {
       body: options,
       auth: true
     });
@@ -2712,7 +3001,7 @@ init_ReactionCollector();
 init_FluxerError();
 init_ErrorCodes();
 var import_builders3 = require("@fluxerjs/builders");
-var import_types16 = require("@fluxerjs/types");
+var import_types20 = require("@fluxerjs/types");
 var import_util8 = require("@fluxerjs/util");
 var import_util9 = require("@fluxerjs/util");
 init_cdn();
@@ -2736,6 +3025,7 @@ init_cdn();
   GuildChannel,
   GuildEmoji,
   GuildMember,
+  GuildMemberManager,
   GuildSticker,
   Invite,
   LinkChannel,
@@ -2752,6 +3042,9 @@ init_cdn();
   Routes,
   TextChannel,
   User,
+  UserFlagsBitField,
+  UserFlagsBits,
+  UsersManager,
   VoiceChannel,
   Webhook,
   cdnAvatarURL,
@@ -2760,5 +3053,6 @@ init_cdn();
   cdnDisplayAvatarURL,
   cdnMemberAvatarURL,
   cdnMemberBannerURL,
+  resolvePermissionsToBitfield,
   resolveTenorToImageUrl
 });