@stoatx/client 0.3.0 → 0.5.0

package/dist/index.cjs

@@ -30,11 +30,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  API: () => API,
   Attachment: () => Attachment,
+  AttachmentBuilder: () => AttachmentBuilder,
   Base: () => Base,
   BaseChannel: () => BaseChannel,
+  BitField: () => BitField,
   ChannelManager: () => ChannelManager,
-  ChannelType: () => ChannelType,
   Client: () => Client,
   ClientUser: () => ClientUser,
   Collection: () => Collection,
@@ -64,9 +66,7 @@ __export(index_exports, {
   TextChannel: () => TextChannel,
   UnknownChannel: () => UnknownChannel,
   User: () => User,
-  UserManager: () => UserManager,
-  UserPresence: () => UserPresence,
-  UserRelationship: () => UserRelationship
+  UserManager: () => UserManager
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -129,7 +129,7 @@ var Attachment = class extends Base {
   serverId;
   objectId;
   constructor(client, data) {
-    super(client, { ...data, id: data._id });
+    super(client, { ...data, _id: data._id });
     this.id = data._id;
     this.tag = data.tag;
     this.filename = data.filename;
@@ -470,7 +470,7 @@ var Message = class extends Base {
   flags = 0;
   interactions = null;
   masquerade = null;
-  mentions = [];
+  mentions = null;
   pinned = false;
   reactions = {};
   replies = [];
@@ -645,7 +645,7 @@ var Message = class extends Base {
   }
   _patch(data) {
     if (data.content !== void 0) this.content = data.content;
-    if (data.edited !== void 0) this.editedAt = new Date(data.edited);
+    if (data.edited !== void 0) this.editedAt = new Date(data.edited ?? 0);
     if (data.pinned !== void 0) this.pinned = data.pinned;
     if (data.embeds !== void 0) this.embeds = data.embeds;
     if (data.flags !== void 0) this.flags = data.flags;
@@ -678,24 +678,6 @@ var Message = class extends Base {
 };
 
 // src/structures/User.ts
-var UserRelationship = /* @__PURE__ */ ((UserRelationship2) => {
-  UserRelationship2["None"] = "None";
-  UserRelationship2["User"] = "User";
-  UserRelationship2["Friend"] = "Friend";
-  UserRelationship2["Outgoing"] = "Outgoing";
-  UserRelationship2["Incoming"] = "Incoming";
-  UserRelationship2["Blocked"] = "Blocked";
-  UserRelationship2["BlockedOther"] = "BlockedOther";
-  return UserRelationship2;
-})(UserRelationship || {});
-var UserPresence = /* @__PURE__ */ ((UserPresence2) => {
-  UserPresence2["Online"] = "Online";
-  UserPresence2["Idle"] = "Idle";
-  UserPresence2["Focus"] = "Focus";
-  UserPresence2["Busy"] = "Busy";
-  UserPresence2["Invisible"] = "Invisible";
-  return UserPresence2;
-})(UserPresence || {});
 var User = class extends Base {
   discriminator;
   online;
@@ -729,7 +711,7 @@ var User = class extends Base {
       this.bot = data.bot ? { owner: data.bot.owner } : false;
     }
     if (data.avatar !== void 0) {
-      this.avatar = new Attachment(this.client, data.avatar);
+      this.avatar = data.avatar ? new Attachment(this.client, data.avatar) : null;
     }
     if (clear && Array.isArray(clear)) {
       for (const field of clear) {
@@ -809,6 +791,7 @@ var GatewayManager = class {
   handleMessage(rawData) {
     const payload = JSON.parse(rawData.toString());
     const eventType = payload.type;
+    this.client.emit("raw", payload);
     switch (eventType) {
       case "Error":
         this.client.emit("error", new Error(`Gateway Error: ${payload.error || JSON.stringify(payload)}`));
@@ -886,7 +869,7 @@ var GatewayManager = class {
         const message = channel?.messages.cache.get(payload.id);
         if (message && payload.append.embeds) {
           const oldMessage = message._clone();
-          message.embeds.push(...payload.append.embeds);
+          message.embeds = [...message.embeds || [], ...payload.append.embeds];
           this.client.emit("messageUpdate", oldMessage, message);
         }
         break;
@@ -1026,13 +1009,28 @@ var GatewayManager = class {
       }
       case "ServerMemberLeave": {
         const server = this.client.servers.cache.get(payload.id);
+        let member = null;
         if (server) {
-          const member = server.members.cache.get(payload.user);
+          member = server.members.cache.get(payload.user);
           if (member) {
             server.members.cache.delete(payload.user);
-            this.client.emit("serverMemberLeave", member);
           }
         }
+        const emitData = member || { serverId: payload.id, userId: payload.user };
+        if (payload.reason === "Ban") {
+          if (server) {
+            const dummyBanPayload = {
+              id: payload.user,
+              reason: null
+            };
+            server.bans._add(dummyBanPayload);
+          }
+          this.client.emit("serverBanAdd", emitData);
+        } else if (payload.reason === "Kick") {
+          this.client.emit("serverMemberKick", emitData);
+        } else {
+          this.client.emit("serverMemberLeave", emitData);
+        }
         break;
       }
       case "EmojiCreate": {
@@ -1066,7 +1064,8 @@ var GatewayManager = class {
         break;
       }
       default:
-        this.client.emit("raw", payload);
+        this.client.emit("debug", `Unhandled Gateway Event Type: ${eventType}`);
+        break;
     }
   }
   startPingLoop() {
@@ -1112,6 +1111,96 @@ var GatewayManager = class {
 
 // src/rest/RESTManager.ts
 var import_undici = require("undici");
+
+// src/utils/schema.ts
+var queryParams = {
+  "/": { get: [] },
+  "/users/@me": { get: [] },
+  "/users/{target}": { get: [], patch: [] },
+  "/users/{target}/flags": { get: [] },
+  "/users/@me/username": { patch: [] },
+  "/users/{target}/default_avatar": { get: [] },
+  "/users/{target}/profile": { get: [] },
+  "/users/dms": { get: [] },
+  "/users/{target}/dm": { get: [] },
+  "/users/{target}/mutual": { get: [] },
+  "/users/{target}/friend": { put: [], delete: [] },
+  "/users/{target}/block": { put: [], delete: [] },
+  "/users/friend": { post: [] },
+  "/bots/create": { post: [] },
+  "/bots/{target}/invite": { get: [], post: [] },
+  "/bots/{bot_id}": { get: [], delete: [], patch: [] },
+  "/bots/@me": { get: [] },
+  "/channels/{target}/ack/{message}": { put: [] },
+  "/channels/{target}": { get: [], delete: ["leave_silently"], patch: [] },
+  "/channels/{target}/members": { get: [] },
+  "/channels/{target}/invites": { post: [] },
+  "/channels/{target}/messages": { get: ["limit", "before", "after", "sort", "nearby", "include_users"], post: [] },
+  "/channels/{target}/search": { post: [] },
+  "/channels/{target}/messages/{msg}/pin": { post: [], delete: [] },
+  "/channels/{target}/messages/{msg}": { get: [], delete: [], patch: [] },
+  "/channels/{target}/messages/bulk": { delete: [] },
+  "/channels/create": { post: [] },
+  "/channels/{group_id}/recipients/{member_id}": { put: [], delete: [] },
+  "/channels/{target}/join_call": { post: [] },
+  "/channels/{target}/end_ring/{target_user}": { put: [] },
+  "/channels/{target}/permissions/{role_id}": { put: [] },
+  "/channels/{target}/permissions/default": { put: [] },
+  "/channels/{target}/messages/{msg}/reactions/{emoji}": { put: [], delete: ["user_id", "remove_all"] },
+  "/channels/{target}/messages/{msg}/reactions": { delete: [] },
+  "/channels/{channel_id}/webhooks": { get: [], post: [] },
+  "/servers/create": { post: [] },
+  "/servers/{target}": { get: ["include_channels"], delete: ["leave_silently"], patch: [] },
+  "/servers/{target}/ack": { put: [] },
+  "/servers/{server}/channels": { post: [] },
+  "/servers/{target}/members": { get: ["exclude_offline"] },
+  "/servers/{server_id}/members/{member_id}": { get: ["roles"], delete: [], patch: [] },
+  "/servers/{target}/members_experimental_query": { get: ["query", "experimental_api"] },
+  "/servers/{server}/bans/{target}": { put: [], delete: [] },
+  "/servers/{target}/bans": { get: [] },
+  "/servers/{target}/invites": { get: [] },
+  "/servers/{target}/roles": { post: [] },
+  "/servers/{target}/roles/{role_id}": { get: [], delete: [], patch: [] },
+  "/servers/{target}/permissions/{role_id}": { put: [] },
+  "/servers/{target}/permissions/default": { put: [] },
+  "/servers/{target}/emojis": { get: [] },
+  "/servers/{target}/roles/ranks": { patch: [] },
+  "/invites/{target}": { get: [], post: [], delete: [] },
+  "/custom/emoji/{emoji_id}": { get: [], put: [], delete: [], patch: [] },
+  "/safety/report": { post: [] },
+  "/auth/account/create": { post: [] },
+  "/auth/account/reverify": { post: [] },
+  "/auth/account/delete": { put: [], post: [] },
+  "/auth/account/": { get: [] },
+  "/auth/account/disable": { post: [] },
+  "/auth/account/change/password": { patch: [] },
+  "/auth/account/change/email": { patch: [] },
+  "/auth/account/verify/{code}": { post: [] },
+  "/auth/account/reset_password": { post: [], patch: [] },
+  "/auth/session/login": { post: [] },
+  "/auth/session/logout": { post: [] },
+  "/auth/session/all": { get: [], delete: ["revoke_self"] },
+  "/auth/session/{id}": { delete: [], patch: [] },
+  "/auth/mfa/ticket": { put: [] },
+  "/auth/mfa/": { get: [] },
+  "/auth/mfa/recovery": { post: [], patch: [] },
+  "/auth/mfa/methods": { get: [] },
+  "/auth/mfa/totp": { put: [], post: [], delete: [] },
+  "/onboard/hello": { get: [] },
+  "/onboard/complete": { post: [] },
+  "/policy/acknowledge": { post: [] },
+  "/push/subscribe": { post: [] },
+  "/push/unsubscribe": { post: [] },
+  "/sync/settings/fetch": { post: [] },
+  "/sync/settings/set": { post: ["timestamp"] },
+  "/sync/unreads": { get: [] },
+  "/webhooks/{webhook_id}/{token}/{message_id}": { delete: [], patch: [] },
+  "/webhooks/{webhook_id}/{token}": { get: [], post: [], delete: [], patch: [] },
+  "/webhooks/{webhook_id}": { get: [], delete: [], patch: [] },
+  "/webhooks/{webhook_id}/{token}/github": { post: [] }
+};
+
+// src/rest/RESTManager.ts
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 var AsyncBucket = class {
   remaining = 1;
@@ -1158,9 +1247,25 @@ var StoatAPIError = class _StoatAPIError extends Error {
     Object.setPrototypeOf(this, _StoatAPIError.prototype);
   }
 };
+var ALL_QUERY_KEYS = /* @__PURE__ */ new Set();
+for (const routes of Object.values(queryParams)) {
+  for (const keys of Object.values(routes)) {
+    for (const key of keys) {
+      ALL_QUERY_KEYS.add(key);
+    }
+  }
+}
 var RESTManager = class {
   constructor(client) {
     this.client = client;
+    setInterval(() => {
+      const now = Date.now();
+      for (const [key, bucket] of this.buckets.entries()) {
+        if (now > bucket.resetAt && bucket.remaining > 0) {
+          this.buckets.delete(key);
+        }
+      }
+    }, 3e5).unref();
   }
   baseURL = "https://stoat.chat/api";
   token = null;
@@ -1174,17 +1279,35 @@ var RESTManager = class {
   getRouteKey(method, endpoint) {
     return `${method}:${endpoint}`;
   }
-  makeRequest(method, endpoint, body) {
-    const routeKey = this.getRouteKey(method, endpoint);
-    let bucket = this.buckets.get(routeKey);
-    if (!bucket) {
-      bucket = new AsyncBucket();
-      this.buckets.set(routeKey, bucket);
+  makeRequest(method, endpoint, params) {
+    let finalEndpoint = endpoint;
+    let finalBody = void 0;
+    if (params && typeof params === "object") {
+      const query = new URLSearchParams();
+      finalBody = {};
+      for (const [key, value] of Object.entries(params)) {
+        if (value !== void 0) {
+          if (ALL_QUERY_KEYS.has(key)) {
+            query.append(key, String(value));
+          } else {
+            finalBody[key] = value;
+          }
+        }
+      }
+      const qs = query.toString();
+      if (qs) finalEndpoint += `?${qs}`;
+      if (Object.keys(finalBody).length === 0) finalBody = void 0;
     }
+    const routeKey = this.getRouteKey(method, finalEndpoint);
     return new Promise((resolve, reject) => {
+      let bucket = this.buckets.get(routeKey);
+      if (!bucket) {
+        bucket = new AsyncBucket();
+        this.buckets.set(routeKey, bucket);
+      }
       bucket.queue = bucket.queue.then(async () => {
         try {
-          const result = await this.execute(method, endpoint, body, bucket);
+          const result = await this.execute(method, finalEndpoint, finalBody, bucket);
           resolve(result);
         } catch (error) {
           reject(error);
@@ -1240,9 +1363,9 @@ var RESTManager = class {
   /**
    * Uploads a file to Stoat's CDN and returns the File ID
    */
-  async uploadFile(filename, fileBuffer) {
+  async uploadFile(tag, fileBuffer, filename) {
     if (!this.token) throw new Error("REST_NOT_READY: No token available.");
-    const url = "https://cdn.stoatusercontent.com/attachments";
+    const url = `https://cdn.stoatusercontent.com/${tag}`;
     const formData = new FormData();
     formData.append("file", new Blob([fileBuffer]), filename);
     const response = await fetch(url, {
@@ -1265,20 +1388,20 @@ var RESTManager = class {
     const data = await response.json();
     return data.id;
   }
-  get(endpoint) {
-    return this.makeRequest("GET", endpoint);
+  get(endpoint, params) {
+    return this.makeRequest("get", endpoint, params);
   }
-  post(endpoint, body) {
-    return this.makeRequest("POST", endpoint, body);
+  post(endpoint, params) {
+    return this.makeRequest("post", endpoint, params);
   }
-  patch(endpoint, body) {
-    return this.makeRequest("PATCH", endpoint, body);
+  patch(endpoint, params) {
+    return this.makeRequest("patch", endpoint, params);
   }
-  delete(endpoint, body) {
-    return this.makeRequest("DELETE", endpoint, body);
+  delete(endpoint, params) {
+    return this.makeRequest("delete", endpoint, params);
   }
-  async put(endpoint, body) {
-    return this.makeRequest("PUT", endpoint, body);
+  put(endpoint, params) {
+    return this.makeRequest("put", endpoint, params);
   }
 };
 
@@ -1310,6 +1433,42 @@ var BaseManager = class {
   }
 };
 
+// src/builders/AttachmentBuilder.ts
+var AttachmentBuilder = class {
+  // Filename for CDN to use, optional but recommended
+  filename = void 0;
+  file;
+  /**
+   * Creates a new AttachmentBuilder with the given file and optional filename.
+   * @param file The file data as a Buffer or Blob.
+   * @param filename An optional filename to use for the uploaded file. If not provided, the CDN will assign a default name.
+   *                 Providing a filename can help with organization and debugging, but is not strictly required.
+   * @example
+   * // Create an attachment from a Buffer with a custom filename
+   * const buffer = Buffer.from("Hello, world!");
+   * const attachment = new AttachmentBuilder(buffer, "greeting.txt");
+   */
+  constructor(file, filename) {
+    this.filename = filename;
+    this.file = file;
+  }
+  /**
+   * Uploads this attachment to the Stoat CDN and returns the resulting file ID.
+   * @internal — use `resolveAttachment()` instead of calling this directly.
+   */
+  async upload(rest, tag) {
+    return rest.uploadFile(tag, this.file, this.filename);
+  }
+};
+
+// src/utils/resolveAttachment.ts
+async function resolveAttachment(rest, value, tag) {
+  if (value instanceof AttachmentBuilder) {
+    return value.upload(rest, tag);
+  }
+  return value;
+}
+
 // src/managers/MessageManager.ts
 var MessageManager = class extends BaseManager {
   constructor(client, channel, limit = Infinity) {
@@ -1320,7 +1479,7 @@ var MessageManager = class extends BaseManager {
    * Tell BaseManager how to find the ID for Messages
    */
   extractId(data) {
-    return data._id ?? data.id;
+    return data._id;
   }
   /**
    * Tell BaseManager how to build a Message
@@ -1345,20 +1504,31 @@ var MessageManager = class extends BaseManager {
    * const history = await channel.messages.fetchMany({ limit: 20, before: "01H..." });
    */
   async fetchMany(options = {}) {
-    const params = new URLSearchParams();
-    if (options.limit !== void 0) params.append("limit", options.limit.toString());
-    if (options.before !== void 0) params.append("before", options.before);
-    if (options.after !== void 0) params.append("after", options.after);
-    if (options.sort !== void 0) params.append("sort", options.sort);
-    if (options.nearby !== void 0) params.append("nearby", options.nearby);
-    if (options.includeUsers !== void 0) params.append("include_users", options.includeUsers.toString());
-    const queryString = params.toString();
-    const endpoint = `/channels/${this.channel.id}/messages${queryString ? `?${queryString}` : ""}`;
-    const data = await this.client.rest.get(endpoint);
-    const rawMessages = Array.isArray(data) ? data : data.messages || [];
-    if (!Array.isArray(data) && data.users) {
-      for (const userData of data.users) {
-        this.client.users._add(userData);
+    const endpoint = `/channels/${this.channel.id}/messages`;
+    const query = {};
+    if (options.limit !== void 0) query.limit = options.limit;
+    if (options.before !== void 0) query.before = options.before;
+    if (options.after !== void 0) query.after = options.after;
+    if (options.sort !== void 0) query.sort = options.sort;
+    if (options.nearby !== void 0) query.nearby = options.nearby;
+    if (options.includeUsers !== void 0) query.include_users = options.includeUsers;
+    const data = await this.client.rest.get(endpoint, query);
+    let rawMessages;
+    if (Array.isArray(data)) {
+      rawMessages = data;
+    } else {
+      rawMessages = data.messages;
+      if (data.users) {
+        for (const userData of data.users) {
+          this.client.users._add(userData);
+        }
+      }
+      if (data.members && this.channel.isText()) {
+        const serverId = this.channel.serverId;
+        const server = await this.client.servers.fetch(serverId);
+        for (const memberData of data.members) {
+          server.members._add(memberData);
+        }
       }
     }
     const fetched = new Collection();
@@ -1379,11 +1549,19 @@ var MessageManager = class extends BaseManager {
    * @returns A promise that resolves to the sent Message.
    */
   async send(contentOrOptions) {
-    const payload = typeof contentOrOptions === "string" ? { content: contentOrOptions } : { ...contentOrOptions };
-    if (payload.embeds) {
-      payload.embeds = payload.embeds.map(
-        (embed) => typeof embed.toJSON === "function" ? embed.toJSON() : embed
+    const opts = typeof contentOrOptions === "string" ? { content: contentOrOptions } : contentOrOptions;
+    const payload = {};
+    if (opts.embeds && opts.embeds.length) {
+      payload.embeds = opts.embeds.map((embed) => typeof embed.toJSON === "function" ? embed.toJSON() : embed);
+    }
+    if (opts.attachments && opts.attachments.length > 0) {
+      const resolved = await Promise.all(
+        opts.attachments.map((attachment) => resolveAttachment(this.client.rest, attachment, "attachments"))
       );
+      const validAttachments = resolved.filter((id) => id !== void 0);
+      if (validAttachments.length > 0) {
+        payload.attachments = validAttachments;
+      }
     }
     const data = await this.client.rest.post(`/channels/${this.channel.id}/messages`, payload);
     return new Message(this.client, data);
@@ -1396,19 +1574,20 @@ var MessageManager = class extends BaseManager {
    */
   async edit(message, contentOrOptions) {
     const id = this.resolveId(message);
-    const payload = typeof contentOrOptions === "string" ? { content: contentOrOptions } : { ...contentOrOptions };
-    if (payload.embeds) {
-      payload.embeds = payload.embeds.map(
-        (embed) => typeof embed.toJSON === "function" ? embed.toJSON() : embed
-      );
+    const opts = typeof contentOrOptions === "string" ? { content: contentOrOptions } : contentOrOptions;
+    const payload = {};
+    if (opts.content !== void 0) {
+      payload.content = opts.content;
     }
-    const data = await this.client.rest.patch(`/channels/${this.channel.id}/messages/${id}`, payload);
-    const existing = this.cache.get(id);
-    if (existing) {
-      existing._patch(data);
-      return existing;
+    if (opts.embeds !== void 0) {
+      if (opts.embeds === null) {
+        payload.embeds = [];
+      } else {
+        payload.embeds = opts.embeds.map((embed) => "toJSON" in embed ? embed.toJSON() : embed);
+      }
     }
-    return new Message(this.client, data);
+    const data = await this.client.rest.patch(`/channels/${this.channel.id}/messages/${id}`, payload);
+    return this._add(data);
   }
   /**
    * Deletes a message from the channel.
@@ -1425,7 +1604,7 @@ var MessageManager = class extends BaseManager {
    */
   async pin(message) {
     const id = this.resolveId(message);
-    await this.client.rest.post(`/channels/${this.channel.id}/messages/${id}/pin`, {});
+    await this.client.rest.post(`/channels/${this.channel.id}/messages/${id}/pin`);
     const existing = this.cache.get(id);
     if (existing) existing.pinned = true;
   }
@@ -1471,12 +1650,14 @@ var MessageManager = class extends BaseManager {
   async removeReaction(message, reaction, userId, removeAll) {
     const id = this.resolveId(message);
     const targetUser = userId ? this.client.users.resolveId(userId) : void 0;
-    const params = new URLSearchParams();
-    if (targetUser) params.append("user_id", targetUser);
-    if (removeAll) params.append("remove_all", "true");
-    const queryString = params.toString();
-    const endpoint = `/channels/${this.channel.id}/messages/${id}/reactions/${encodeURIComponent(reaction)}${queryString ? `?${queryString}` : ""}`;
-    await this.client.rest.delete(endpoint);
+    const endpoint = `/channels/${this.channel.id}/messages/${id}/reactions/${reaction}`;
+    const query = {};
+    if (targetUser) {
+      query.user_id = targetUser;
+    } else if (removeAll) {
+      query.remove_all = true;
+    }
+    await this.client.rest.delete(endpoint, query);
   }
   /**
    * Remove all reactions from a message
@@ -1539,12 +1720,6 @@ var MessageCollector = class extends Collector {
 };
 
 // src/structures/BaseChannel.ts
-var ChannelType = /* @__PURE__ */ ((ChannelType2) => {
-  ChannelType2["TEXT"] = "TextChannel";
-  ChannelType2["DM"] = "DirectMessage";
-  ChannelType2["GROUP"] = "Group";
-  return ChannelType2;
-})(ChannelType || {});
 var BaseChannel = class extends Base {
   type;
   messages;
@@ -1668,13 +1843,13 @@ var BaseChannel = class extends Base {
     });
   }
   isText() {
-    return this.type === "TextChannel" /* TEXT */;
+    return this.type === "TextChannel";
   }
   isDM() {
-    return this.type === "DirectMessage" /* DM */;
+    return this.type === "DirectMessage";
   }
   isGroup() {
-    return this.type === "Group" /* GROUP */;
+    return this.type === "Group";
   }
 };
 
@@ -1694,7 +1869,9 @@ var TextChannel = class extends BaseChannel {
     this.serverId = data.server;
     this.defaultPermissions = data.default_permissions;
     this.description = data.description;
-    this.icon = data.icon;
+    if (data.icon !== void 0) {
+      this.icon = data.icon ? new Attachment(this.client, data.icon) : null;
+    }
     this.lastMessageId = data.last_message_id;
     this.nsfw = data.nsfw ?? false;
     this.slowmode = data.slowmode ?? 0;
@@ -1764,6 +1941,9 @@ var TextChannel = class extends BaseChannel {
   async setCategory(category) {
     const serverId = this.serverId;
     const server = await this.client.servers.fetch(serverId);
+    if (!server.categories || server.categories.length === 0) {
+      throw new Error("This server has no categories to move the channel into.");
+    }
     const categories = server.categories.map((c) => ({
       id: c.id,
       title: c.title,
@@ -1794,6 +1974,9 @@ var TextChannel = class extends BaseChannel {
   async setPosition(position) {
     const serverId = this.serverId;
     const server = await this.client.servers.fetch(serverId);
+    if (!server.categories || server.categories.length === 0) {
+      throw new Error("This server has no categories to move the channel into.");
+    }
     const categories = server.categories.map((c) => ({
       id: c.id,
       title: c.title,
@@ -1981,18 +2164,245 @@ var GroupChannel = class extends BaseChannel {
 // src/utils/ChannelFactory.ts
 function createChannel(client, data) {
   switch (data.channel_type) {
-    case "TextChannel" /* TEXT */:
+    case "TextChannel":
       return new TextChannel(client, data);
-    case "DirectMessage" /* DM */:
+    case "DirectMessage":
       return new DMChannel(client, data);
-    case "Group" /* GROUP */:
+    case "Group":
       return new GroupChannel(client, data);
     default:
-      client.emit("debug", `Received unknown channel type: ${data.type}`);
+      client.emit("debug", `Received unknown channel type: ${data.channel_type}`);
       return new UnknownChannel(client, data);
   }
 }
 
+// src/utils/BitField.ts
+var BitField = class _BitField {
+  static Flags = {};
+  static DefaultBit = 0;
+  bitfield;
+  constructor(bits) {
+    this.bitfield = this.constructor.resolve(
+      bits ?? this.constructor.DefaultBit
+    );
+  }
+  /**
+   * Checks whether this bitfield has any of the given bits set.
+   *
+   * @param bit The bit(s) to test against.
+   * @returns `true` if at least one of the provided bits is set.
+   *
+   * @example
+   * perms.any(['SendMessage', 'ManageChannel']); // true if either is set
+   */
+  any(bit) {
+    const resolved = this.constructor.resolve(bit);
+    if (typeof this.bitfield === "bigint" && typeof resolved === "bigint") {
+      return (this.bitfield & resolved) !== BigInt(0);
+    }
+    return (Number(this.bitfield) & Number(resolved)) !== 0;
+  }
+  /**
+   * Checks whether this bitfield is exactly equal to the given bit value.
+   *
+   * @param bit The bit(s) to compare against.
+   * @returns `true` if the resolved bit value is identical to this bitfield.
+   *
+   * @example
+   * new Permissions(0n).equals(0n); // true
+   */
+  equals(bit) {
+    return this.bitfield === this.constructor.resolve(bit);
+  }
+  /**
+   * Checks whether this bitfield has *all* of the given bits set.
+   *
+   * @param bit The bit(s) to check for.
+   * @returns `true` if every provided bit is set in this bitfield.
+   *
+   * @example
+   * perms.has('SendMessage');
+   * perms.has(['SendMessage', 'ViewChannel']); // true only if both are set
+   */
+  has(bit, ..._hasParams) {
+    const resolvedBit = this.constructor.resolve(bit);
+    if (typeof this.bitfield === "bigint" && typeof resolvedBit === "bigint") {
+      return (this.bitfield & resolvedBit) === resolvedBit;
+    }
+    return (Number(this.bitfield) & Number(resolvedBit)) === Number(resolvedBit);
+  }
+  /**
+   * Returns the flag names present in `bits` that are *missing* from this bitfield.
+   *
+   * @param bits The bits to check against.
+   * @returns An array of flag name strings that are in `bits` but not in this bitfield.
+   *
+   * @example
+   * // If perms only has SendMessage:
+   * perms.missing(['SendMessage', 'ManageChannel']); // ['ManageChannel']
+   */
+  missing(bits, ...hasParams) {
+    return new this.constructor(bits).remove(this).toArray(...hasParams);
+  }
+  /**
+   * Freezes this BitField instance, making it immutable.
+   * Subsequent calls to `add()` or `remove()` will return a new instance instead of mutating this one.
+   *
+   * @returns This instance, frozen.
+   */
+  freeze() {
+    return Object.freeze(this);
+  }
+  /**
+   * Adds one or more bits to this bitfield.
+   * If the instance is frozen, returns a new BitField with the bits added.
+   *
+   * @param bits The bit(s) to add.
+   * @returns This instance (or a new one if frozen), with the bits added.
+   *
+   * @example
+   * perms.add('SendMessage', 'ViewChannel');
+   */
+  add(...bits) {
+    let total = this.constructor.DefaultBit;
+    for (const bit of bits) {
+      const resolved = this.constructor.resolve(bit);
+      if (typeof total === "bigint" && typeof resolved === "bigint") {
+        total |= resolved;
+      } else {
+        total = Number(total) | Number(resolved);
+      }
+    }
+    if (typeof this.bitfield === "bigint" && typeof total === "bigint") {
+      if (Object.isFrozen(this)) return new this.constructor(this.bitfield | total);
+      this.bitfield |= total;
+    } else {
+      if (Object.isFrozen(this))
+        return new this.constructor(Number(this.bitfield) | Number(total));
+      this.bitfield = Number(this.bitfield) | Number(total);
+    }
+    return this;
+  }
+  /**
+   * Removes one or more bits from this bitfield.
+   * If the instance is frozen, returns a new BitField with the bits removed.
+   *
+   * @param bits The bit(s) to remove.
+   * @returns This instance (or a new one if frozen), with the bits cleared.
+   *
+   * @example
+   * perms.remove('ManageChannel');
+   */
+  remove(...bits) {
+    let total = this.constructor.DefaultBit;
+    for (const bit of bits) {
+      const resolved = this.constructor.resolve(bit);
+      if (typeof total === "bigint" && typeof resolved === "bigint") {
+        total |= resolved;
+      } else {
+        total = Number(total) | Number(resolved);
+      }
+    }
+    if (typeof this.bitfield === "bigint" && typeof total === "bigint") {
+      if (Object.isFrozen(this)) return new this.constructor(this.bitfield & ~total);
+      this.bitfield &= ~total;
+    } else {
+      if (Object.isFrozen(this))
+        return new this.constructor(Number(this.bitfield) & ~Number(total));
+      this.bitfield = Number(this.bitfield) & ~Number(total);
+    }
+    return this;
+  }
+  /**
+   * Serializes this bitfield to a plain object mapping each flag name to a boolean
+   * indicating whether that flag is set.
+   *
+   * @returns A record of `{ [flagName]: boolean }` for all defined flags.
+   *
+   * @example
+   * perms.serialize();
+   * // { SendMessage: true, ManageChannel: false, ... }
+   */
+  serialize(...hasParams) {
+    const serialized = {};
+    for (const [flag, bit] of Object.entries(this.constructor.Flags)) {
+      if (isNaN(Number(flag))) serialized[flag] = this.has(bit, ...hasParams);
+    }
+    return serialized;
+  }
+  /**
+   * Returns an array of flag names that are set in this bitfield.
+   *
+   * @returns An array of string flag names.
+   *
+   * @example
+   * perms.toArray(); // ['SendMessage', 'ViewChannel']
+   */
+  toArray(...hasParams) {
+    return [...this[Symbol.iterator](...hasParams)];
+  }
+  /**
+   * Returns the bitfield value as a JSON-safe primitive.
+   * Numbers are returned as-is; bigints are converted to their string representation
+   * to avoid JSON serialization errors.
+   */
+  toJSON() {
+    return typeof this.bitfield === "number" ? this.bitfield : this.bitfield.toString();
+  }
+  /**
+   * Returns the underlying numeric value of this bitfield.
+   * Allows BitField instances to be used directly in arithmetic expressions.
+   */
+  valueOf() {
+    return this.bitfield;
+  }
+  /**
+   * Iterates over the names of all flags that are set in this bitfield.
+   *
+   * @example
+   * for (const flag of perms) {
+   *   console.log(flag); // 'SendMessage', 'ViewChannel', etc.
+   * }
+   */
+  *[Symbol.iterator](...hasParams) {
+    for (const bitName of Object.keys(this.constructor.Flags)) {
+      if (isNaN(Number(bitName)) && this.has(bitName, ...hasParams)) yield bitName;
+    }
+  }
+  /**
+   * Resolves a {@link BitFieldResolvable} into a raw `number | bigint`.
+   *
+   * Resolution rules (in order):
+   * - `undefined` → `DefaultBit`
+   * - A number or bigint matching `DefaultBit`'s type and >= 0 → returned as-is
+   * - A `BitField` instance → its `.bitfield` value
+   * - An array → each element resolved and OR'd together
+   * - A numeric string → parsed as `BigInt` or `Number` depending on `DefaultBit`'s type
+   * - A named string flag → looked up in `Flags`
+   * - Anything else → throws `RangeError`
+   *
+   * @param bit The value to resolve.
+   * @throws {RangeError} If the value cannot be resolved to a valid bit.
+   */
+  static resolve(bit) {
+    const { DefaultBit } = this;
+    if (bit === void 0) return DefaultBit;
+    if (typeof DefaultBit === typeof bit && bit >= DefaultBit) return bit;
+    if (bit instanceof _BitField) return bit.bitfield;
+    if (Array.isArray(bit)) {
+      return bit.map((b) => this.resolve(b)).reduce((prev, b) => {
+        if (typeof prev === "bigint" && typeof b === "bigint") return prev | b;
+        return Number(prev) | Number(b);
+      }, DefaultBit);
+    }
+    if (typeof bit === "string") {
+      if (!isNaN(Number(bit))) return typeof DefaultBit === "bigint" ? BigInt(bit) : Number(bit);
+      if (this.Flags[bit] !== void 0) return this.Flags[bit];
+    }
+    throw new RangeError(`Invalid bitfield flag or number: ${String(bit)}`);
+  }
+};
+
 // src/utils/permissions.ts
 var PermissionFlags = {
   // Server permissions
@@ -2036,26 +2446,26 @@ var PermissionFlags = {
   // Grant all
   GrantAllSafe: 0x000fffffffffffffn
 };
-var Permissions = class {
-  /**
-   * Converts a string, BigInt, or array of strings into a single BigInt
-   */
-  static resolve(permission) {
-    if (typeof permission === "bigint") return permission;
-    if (typeof permission === "string") {
-      return PermissionFlags[permission] ?? 0n;
-    }
-    if (Array.isArray(permission)) {
-      return permission.reduce((acc, p) => acc | this.resolve(p), 0n);
-    }
-    return 0n;
+var Permissions = class extends BitField {
+  static Flags = PermissionFlags;
+  static DefaultBit = 0n;
+  static resolve(bit) {
+    return super.resolve(bit);
   }
-  /**
-   * Checks if a specific permission bit exists
-   */
-  static has(totalPermissions, permissionToCheck) {
-    const resolvedCheck = this.resolve(permissionToCheck);
-    return (totalPermissions & resolvedCheck) === resolvedCheck;
+  has(bit) {
+    return super.has(bit);
+  }
+  any(bit) {
+    return super.any(bit);
+  }
+  missing(bits) {
+    return super.missing(bits);
+  }
+  add(...bits) {
+    return super.add(...bits);
+  }
+  remove(...bits) {
+    return super.remove(...bits);
   }
 };
 
@@ -2070,7 +2480,7 @@ var ChannelManager = class extends BaseManager {
     super(client, limit);
   }
   extractId(data) {
-    return data._id ?? data.id;
+    return data._id;
   }
   construct(data) {
     return createChannel(this.client, data);
@@ -2163,8 +2573,14 @@ var ChannelManager = class extends BaseManager {
       else payload.description = options.description;
     }
     if (options.icon !== void 0) {
-      if (options.icon === null) remove.push("Icon");
-      else payload.icon = options.icon;
+      if (options.icon === null) {
+        remove.push("Icon");
+      } else {
+        const resolvedIcon = await resolveAttachment(this.client.rest, options.icon, "icons");
+        if (resolvedIcon !== void 0) {
+          payload.icon = resolvedIcon;
+        }
+      }
     }
     if (remove.length > 0) payload.remove = remove;
     if (Object.keys(payload).length === 0) return this.fetch(channel);
@@ -2249,7 +2665,7 @@ var ChannelManager = class extends BaseManager {
    * await client.channels.pin("CHANNEL_ID", "MESSAGE_ID");
    */
   async pin(id, messageId) {
-    await this.client.rest.post(`/channels/${id}/pins/${messageId}`);
+    await this.client.rest.post(`/channels/${id}/messages/${messageId}/pin`);
   }
   /**
    * Unpin a message
@@ -2279,7 +2695,7 @@ var ChannelManager = class extends BaseManager {
       if ("id" in msg) return msg.id;
       throw new TypeError("Invalid MessageResolvable provided. Expected a Message object or a string ID/Mention.");
     });
-    await this.client.rest.delete(`/channels/${id}/messages/bulk`, { messages: messageIds });
+    await this.client.rest.delete(`/channels/${id}/messages/bulk`, { ids: messageIds });
   }
 };
 
@@ -2378,20 +2794,20 @@ var Member = class extends Base {
   canRecieve = false;
   // Member roles manager
   roles;
-  constructor(client, data) {
-    super(client, { _id: data.user._id });
-    this.serverId = data.serverId || data.server_id;
-    this.joinedAt = new Date(data.joinedAt || data.joined_at);
+  constructor(client, data, serverId) {
+    super(client, { _id: data._id?.user });
+    this.serverId = data._id?.server ?? serverId;
+    this.joinedAt = new Date(data.joined_at);
     this.roles = new MemberRoleManager(this);
     this._patch(data);
   }
   _patch(data) {
     if (data.nickname !== void 0) this.nickname = data.nickname;
-    if (data.avatar !== void 0) this.avatar = data.avatar;
+    if (data.avatar !== void 0) this.avatar = data.avatar ? new Attachment(this.client, data.avatar) : null;
     if (data.roles !== void 0) this._roles = data.roles;
     if (data.timeout !== void 0) this.timeout = data.timeout ? new Date(data.timeout) : null;
-    if (data.can_publish !== void 0) this.canPublish = data.canPublish;
-    if (data.can_recieve !== void 0) this.canRecieve = data.canRecieve;
+    if (data.can_publish !== void 0) this.canPublish = data.can_publish;
+    if (data.can_receive !== void 0) this.canRecieve = data.can_receive;
   }
   /**
    * Get member role IDs
@@ -2410,15 +2826,15 @@ var Member = class extends Base {
   /** Calculates the member's total permissions using BigInt */
   get permissions() {
     const server = this.server;
-    if (!server) return 0n;
+    if (!server) return new Permissions(0n);
+    if (server.ownerId === this.id) {
+      return new Permissions(PermissionFlags.GrantAllSafe);
+    }
     let totalPerms = server.defaultPermissions ?? 0n;
     for (const role of this.roles.cache.values()) {
-      totalPerms |= BigInt(role.permissions);
-    }
-    if (server.ownerId === this.id) {
-      return PermissionFlags.GrantAllSafe;
+      totalPerms |= BigInt(role.permissions.bitfield);
     }
-    return totalPerms;
+    return new Permissions(totalPerms);
   }
   /** Get avatar URL for this member, or null if they don't have one.
    * @example
@@ -2482,10 +2898,6 @@ var Member = class extends Base {
   async setNickname(nickname) {
     return this.edit({ nickname });
   }
-  /** Checks if the member has a specific permission */
-  hasPermission(permission) {
-    return Permissions.has(this.permissions, permission);
-  }
   /**
    * Edit this member.
    * @param options The options to edit the member with (nickname, roles, timeout, etc.)
@@ -2540,17 +2952,14 @@ var MemberManager = class extends BaseManager {
    * @internal
    */
   extractId(data) {
-    return data.user_id ?? data.id ?? (typeof data._id === "string" ? data._id : data._id?.user);
+    return data._id?.user;
   }
   /**
    * Tell BaseManager how to build a Member
    * @internal
    */
   construct(data) {
-    if (!data.server_id && !data.serverId) {
-      data.serverId = this.server.id;
-    }
-    return new Member(this.client, data);
+    return new Member(this.client, data, this.server.id);
   }
   /**
    * Resolve a string or mention to Member
@@ -2609,23 +3018,22 @@ var MemberManager = class extends BaseManager {
    * const onlineMembers = await server.members.fetchMany({ exclude_offline: true });
    */
   async fetchMany(options = {}) {
-    const params = new URLSearchParams();
-    if (options.exclude_offline !== void 0) {
-      params.append("exclude_offline", options.exclude_offline.toString());
+    const query = {};
+    if (options.excludeOffline !== void 0) {
+      query.exclude_offline = options.excludeOffline;
     }
-    const queryString = params.toString();
-    const endpoint = `/servers/${this.server.id}/members${queryString ? `?${queryString}` : ""}`;
-    const data = await this.client.rest.get(endpoint);
-    if (data.users && Array.isArray(data.users)) {
+    const data = await this.client.rest.get(`/servers/${this.server.id}/members`, query);
+    if (data.users) {
       for (const userData of data.users) {
         this.client.users._add(userData);
       }
     }
     const fetched = new Collection();
-    const rawMembers = data.members || (Array.isArray(data) ? data : []);
-    for (const rawMember of rawMembers) {
-      const member = this._add(rawMember);
-      fetched.set(member.id, member);
+    if (data.members) {
+      for (const rawMember of data.members) {
+        const member = this._add(rawMember);
+        fetched.set(member.id, member);
+      }
     }
     return fetched;
   }
@@ -2728,11 +3136,17 @@ var ServerChannelManager = class {
   async create(options) {
     if (!options.name) throw new Error("A channel name must be provided.");
     const payload = {
-      name: options.name,
-      type: options.type ?? "Text",
-      description: options.description,
-      nsfw: options.nsfw ?? false
+      name: options.name
     };
+    if (options.nsfw !== void 0) {
+      payload.nsfw = options.nsfw;
+    }
+    if (options.type !== void 0) {
+      payload.type = options.type;
+    }
+    if (options.description !== void 0) {
+      payload.description = options.description;
+    }
     if (options.type === "Voice" && options.voice?.max_users) {
       payload.voice = { max_users: options.voice.max_users };
     }
@@ -2752,7 +3166,8 @@ var Role = class extends Base {
   color = null;
   hoist = false;
   rank = 0;
-  permissions = 0n;
+  icon = null;
+  _permissions = 0n;
   constructor(client, data, serverId) {
     super(client, data);
     this.serverId = serverId;
@@ -2764,19 +3179,20 @@ var Role = class extends Base {
    */
   _patch(data) {
     if (data.name !== void 0) this.name = data.name;
-    if (data.color !== void 0) this.color = data.color;
+    if (data.colour !== void 0) this.color = data.colour;
     if (data.hoist !== void 0) this.hoist = data.hoist;
     if (data.rank !== void 0) this.rank = data.rank;
+    if (data.icon !== void 0) this.icon = data.icon !== null ? new Attachment(this.client, data.icon) : null;
     if (data.permissions !== void 0) {
       try {
         if (typeof data.permissions === "object" && data.permissions !== null) {
-          const allowPerms = data.permissions.a ?? data.permissions[0] ?? 0;
-          this.permissions = BigInt(allowPerms);
+          const allowPerms = data.permissions.a ?? 0;
+          this._permissions = BigInt(allowPerms);
         } else {
-          this.permissions = BigInt(data.permissions);
+          this._permissions = BigInt(data.permissions);
         }
       } catch {
-        this.permissions = 0n;
+        this._permissions = 0n;
       }
     }
   }
@@ -2788,12 +3204,10 @@ var Role = class extends Base {
     return this.client.servers.cache.get(this.serverId);
   }
   /**
-   * Checks whether this role has a specific permission.
-   * @param permission The permission to check for.
-   * @returns True if the role has the permission.
+   * Permissions for this role
    */
-  hasPermission(permission) {
-    return Permissions.has(this.permissions, permission);
+  get permissions() {
+    return new Permissions(this._permissions);
   }
   /**
    * Fetches this role directly from the API to ensure data is up to date.
@@ -2821,10 +3235,10 @@ var Role = class extends Base {
    * @throws {Error} If the API request fails (e.g., lack of permissions).
    * @example
    * // Change the role's name and color
-   * await role.edit({ name: "Senior Admin", colour: "#FFD700" });
+   * await role.edit({ name: "Senior Admin", color: "#FFD700" });
    *
    * // Remove the custom color from the role
-   * await role.edit({ colour: null });
+   * await role.edit({ color: null });
    */
   async edit(options) {
     let server = this.server;
@@ -2883,6 +3297,73 @@ var Role = class extends Base {
     await server.roles.setRanks(filteredRoles);
     return this;
   }
+  /**
+   * Change the name for this role
+   * @param name The new name for the role
+   * @returns A promise that resolves to this updated Role object.
+   * @throws {Error} If API request fails.
+   * @example
+   * // Change the role's name
+   * await role.setName("New Role Name");
+   * console.log(`Role's new name: ${role.name}`);
+   */
+  async setName(name) {
+    return await this.edit({ name });
+  }
+  /**
+   * Change the color for this role, it can be a HEX or CSS colours
+   * @param {[string]} color The new color for the role
+   * @returns A promise that resolves to this updated Role object.
+   * @throws {Error} If API request fails
+   * @example
+   * // Change the role's color
+   * await role.setColour("#FF0000");
+   * console.log(`Role's new color: ${role.color}`);
+   *
+   * // Use CSS color linear-graident
+   * await role.setColour("linear-gradient(90deg, #FF0000, #0000FF)");
+   * console.log(`Role's new color: ${role.color}`);
+   *
+   * // Remove the custom color from the role
+   * await role.setColour(null);
+   * console.log(`Role's color removed, current color: ${role.color}`);
+   */
+  async setColor(color) {
+    return await this.edit({ color });
+  }
+  /**
+   * Edit the icon of this role
+   * @param icon Autumn ID for the new icon, or null to remove the custom icon
+   * @returns A promise that resolves to this updated Role object.
+   * @throws {Error} If API request fails
+   * @example
+   * // Set a new icon for the role
+   * await role.setIcon("AUTUMN_ID_FOR_ICON");
+   * console.log(`Role's new icon: ${role.icon}`);
+   *
+   * // Use AttachmentBuilder to upload a new icon file
+   * import { readFile } from "node:fs/promises";
+   * const iconFile = await readFile("./a.jpg");
+   * const attachment = new AttachmentBuilder(iconFile, "a.jpg");
+   * await role.setIcon(attachment);
+   * console.log(`Role's new icon: ${role.icon}`);
+   */
+  async setIcon(icon) {
+    return await this.edit({ icon });
+  }
+  /**
+   * Change the hoist status for this role
+   * @param hoist The new hoist status for the role
+   * @returns A promise that resolves to this updated Role object.
+   * @throws {Error} If API request fails
+   * @example
+   * // Enable hoisting for the role
+   * await role.setHoist(true);
+   * console.log(`Role is now hoisted: ${role.hoist}`);
+   */
+  async setHoist(hoist) {
+    return await this.edit({ hoist });
+  }
   /**
    * Customizer for Node.js `console.log` and `util.inspect`.
    * Hides the cyclic client reference and raw serverId for a cleaner output.
@@ -2908,7 +3389,7 @@ var RoleManager = class extends BaseManager {
    * Tell BaseManager how to find the ID for Roles
    */
   extractId(data) {
-    return data._id ?? data.id;
+    return data._id;
   }
   /**
    * Tell BaseManager how to build a Role
@@ -2924,7 +3405,7 @@ var RoleManager = class extends BaseManager {
    * @returns The newly created or updated Role object.
    */
   _add(data, idParam) {
-    const id = idParam ?? data._id ?? data.id;
+    const id = idParam ?? data._id;
     const existing = this.cache.get(id);
     if (existing) {
       existing._patch(data);
@@ -2987,7 +3468,7 @@ var RoleManager = class extends BaseManager {
       name: options.name
     };
     const data = await this.client.rest.post(`/servers/${this.server.id}/roles`, payload);
-    return this._add(data);
+    return this._add(data.role);
   }
   /**
    * Fetches a Role from the API or resolves it from the local cache.
@@ -3020,7 +3501,7 @@ var RoleManager = class extends BaseManager {
   }
   /**
    * Edits an existing role in the server.
-   * @param role The RoleResolvable to edit.
+   * @param role The {@link RoleResolvable} to edit.
    * @param options The fields to update.
    * @returns A promise that resolves to the updated Role.
    * @throws {TypeError} If invalid options or RoleResolvable are provided.
@@ -3041,11 +3522,21 @@ var RoleManager = class extends BaseManager {
     const remove = [];
     if (options.name !== void 0) payload.name = options.name;
     if (options.hoist !== void 0) payload.hoist = options.hoist;
-    if (options.colour !== void 0) {
-      if (options.colour === null) {
+    if (options.color !== void 0) {
+      if (options.color === null) {
         remove.push("Colour");
       } else {
-        payload.colour = options.colour;
+        payload.colour = options.color;
+      }
+    }
+    if (options.icon !== void 0) {
+      if (options.icon === null) {
+        remove.push("Icon");
+      } else {
+        const resolvedIcon = await resolveAttachment(this.client.rest, options.icon, "icons");
+        if (resolvedIcon !== void 0) {
+          payload.icon = resolvedIcon;
+        }
       }
     }
     if (remove.length > 0) {
@@ -3054,7 +3545,8 @@ var RoleManager = class extends BaseManager {
     if (Object.keys(payload).length === 0) {
       return this.fetch(id);
     }
-    const data = await this.client.rest.patch(`/servers/${this.server.id}/roles/${id}`, payload);
+    const endpoint = `/servers/${this.server.id}/roles/${id}`;
+    const data = await this.client.rest.patch(endpoint, payload);
     return this._add(data, id);
   }
   /**
@@ -3130,7 +3622,7 @@ var RoleManager = class extends BaseManager {
     const payload = {
       ranks: mappedIds
     };
-    const data = await this.client.rest.put(`/servers/${this.server.id}/roles`, payload);
+    const data = await this.client.rest.patch(`/servers/${this.server.id}/roles/ranks`, payload);
     this.server._patch(data);
     return this.server;
   }
@@ -3142,7 +3634,7 @@ var ServerInvite = class {
   creatorId;
   channelId;
   constructor(data) {
-    this.code = data._id ?? data.code;
+    this.code = data._id;
     this.creatorId = data.creator;
     this.channelId = data.channel;
   }
@@ -3159,7 +3651,7 @@ var ServerInviteManager = class extends BaseManager {
     this.server = server;
   }
   extractId(data) {
-    return data._id ?? data.code;
+    return data._id;
   }
   construct(data) {
     return new ServerInvite(data);
@@ -3169,9 +3661,8 @@ var ServerInviteManager = class extends BaseManager {
    */
   async fetch() {
     const data = await this.client.rest.get(`/servers/${this.server.id}/invites`);
-    const rawInvites = Array.isArray(data) ? data : [];
     const fetched = new Collection();
-    for (const raw of rawInvites) {
+    for (const raw of data) {
       const invite = this._add(raw);
       fetched.set(invite.code, invite);
     }
@@ -3184,7 +3675,7 @@ var ServerBan = class {
   userId;
   reason;
   constructor(data) {
-    this.userId = data._id?.user ?? data.id;
+    this.userId = data._id?.user;
     this.reason = data.reason ?? null;
   }
   _patch(data) {
@@ -3291,7 +3782,7 @@ var Server = class extends Base {
   ownerId;
   analytics = false;
   banner = null;
-  categories = [];
+  categories = null;
   description = null;
   discoverable = false;
   flags = 0;
@@ -3344,13 +3835,6 @@ var Server = class extends Base {
         this.roles._add({ id, ...roleData });
       }
     }
-    if (data.emojis !== void 0) {
-      if (Array.isArray(data.emojis)) {
-        for (const emoji of data.emojis) {
-          this.emojis._add(emoji);
-        }
-      }
-    }
     if (clear && Array.isArray(clear)) {
       for (const field of clear) {
         switch (field) {
@@ -3398,7 +3882,7 @@ var ServerManager = class extends BaseManager {
    * Tell BaseManager how to find the ID for Servers
    */
   extractId(data) {
-    return data._id ?? data.id;
+    return data._id;
   }
   /**
    * Tell BaseManager how to build a Server
@@ -3439,21 +3923,19 @@ var ServerManager = class extends BaseManager {
       payload.system_messages = {};
       const sm = options.systemMessages;
       if (sm.userJoined !== void 0) {
-        if (sm.userJoined === null) remove.push("SystemMessageUserJoined");
-        else payload.system_messages.user_joined = sm.userJoined;
+        payload.system_messages.user_joined = sm.userJoined;
       }
       if (sm.userLeft !== void 0) {
-        if (sm.userLeft === null) remove.push("SystemMessageUserLeft");
-        else payload.system_messages.user_left = sm.userLeft;
+        payload.system_messages.user_left = sm.userLeft;
       }
       if (sm.userKicked !== void 0) {
-        if (sm.userKicked === null) remove.push("SystemMessageUserKicked");
-        else payload.system_messages.user_kicked = sm.userKicked;
+        payload.system_messages.user_kicked = sm.userKicked;
       }
       if (sm.userBanned !== void 0) {
-        if (sm.userBanned === null) remove.push("SystemMessageUserBanned");
-        else payload.system_messages.user_banned = sm.userBanned;
+        payload.system_messages.user_banned = sm.userBanned;
       }
+    } else if (options.systemMessages === null) {
+      remove.push("SystemMessages");
     }
     if (options.categories !== void 0) payload.categories = options.categories;
     if (options.analytics !== void 0) payload.analytics = options.analytics;
@@ -3476,7 +3958,7 @@ var UserManager = class extends BaseManager {
    * Tell BaseManager how to find the ID for Users
    */
   extractId(data) {
-    return data._id ?? data.id;
+    return data._id;
   }
   /**
    * Tell BaseManager how to build a User
@@ -3611,7 +4093,7 @@ var UserManager = class extends BaseManager {
     if (Object.keys(payload).length === 0) {
       return this.fetch("@me");
     }
-    const data = await this.client.rest.patch(`/users/@me`, payload);
+    const data = await this.client.rest.patch(`/users/${this.client.user?.id}`, payload);
     return this._add(data);
   }
   /**
@@ -3771,13 +4253,18 @@ var EmbedBuilder = class {
     return { ...this.data };
   }
 };
+
+// src/index.ts
+var API = __toESM(require("stoat-api"), 1);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  API,
   Attachment,
+  AttachmentBuilder,
   Base,
   BaseChannel,
+  BitField,
   ChannelManager,
-  ChannelType,
   Client,
   ClientUser,
   Collection,
@@ -3807,8 +4294,6 @@ var EmbedBuilder = class {
   TextChannel,
   UnknownChannel,
   User,
-  UserManager,
-  UserPresence,
-  UserRelationship
+  UserManager
 });
 //# sourceMappingURL=index.cjs.map