@stoatx/client 0.4.0 → 0.6.0

package/dist/index.js

@@ -40,7 +40,7 @@ var Base = class _Base {
 };
 
 // src/structures/Message.ts
-import * as util2 from "util";
+import * as util3 from "util";
 
 // src/structures/Attachment.ts
 var Attachment = class extends Base {
@@ -57,7 +57,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;
@@ -386,6 +386,82 @@ var ReactionCollector = class extends Collector {
   }
 };
 
+// src/structures/MessageMentions.ts
+import util2 from "util";
+var MessageMentions = class _MessageMentions {
+  constructor(client, message, userIds, roleIds) {
+    this.client = client;
+    this.message = message;
+    this.userIds = userIds ?? [];
+    this.roleIds = roleIds ?? [];
+    this.channelIds = message.content ? _MessageMentions.parseChannelIds(message.content) : [];
+  }
+  /** Raw user IDs from the API */
+  userIds;
+  /** Raw role IDs from the API */
+  roleIds;
+  /** Raw channel IDs parsed from message content */
+  channelIds;
+  /** Mentioned users resolved from cache */
+  get users() {
+    const col = new Collection();
+    for (const id of this.userIds) {
+      const user = this.client.users.cache.get(id);
+      if (user) col.set(id, user);
+    }
+    return col;
+  }
+  /** Mentioned members resolved from cache (only in server channels) */
+  get members() {
+    const col = new Collection();
+    const server = this.message.server;
+    if (!server) return col;
+    for (const id of this.userIds) {
+      const member = server.members.cache.get(id);
+      if (member) col.set(id, member);
+    }
+    return col;
+  }
+  /** Mentioned roles resolved from cache */
+  get roles() {
+    const col = new Collection();
+    const server = this.message.server;
+    if (!server) return col;
+    for (const id of this.roleIds) {
+      const role = server.roles.cache.get(id);
+      if (role) col.set(id, role);
+    }
+    return col;
+  }
+  /** Mentioned channels resolved from cache */
+  get channels() {
+    const col = new Collection();
+    for (const id of this.channelIds) {
+      const channel = this.client.channels.cache.get(id);
+      if (channel) col.set(id, channel);
+    }
+    return col;
+  }
+  /** Whether the given user ID is mentioned */
+  has(userId) {
+    return this.userIds.includes(userId);
+  }
+  static parseChannelIds(content) {
+    return [...content.matchAll(/<#([A-Z0-9]+)>/g)].flatMap((m) => m[1] ? [m[1]] : []);
+  }
+  [util2.inspect.custom](depth, options, inspect12) {
+    const { client, message, ...props } = this;
+    const data = {
+      ...props,
+      members: this.members,
+      channels: this.channels,
+      users: this.users,
+      roles: this.roles
+    };
+    return `${this.constructor.name} ${inspect12(data, { ...options, depth: depth ?? options.depth })}`;
+  }
+};
+
 // src/structures/Message.ts
 var Message = class extends Base {
   content = null;
@@ -398,11 +474,10 @@ var Message = class extends Base {
   flags = 0;
   interactions = null;
   masquerade = null;
-  mentions = [];
+  mentions;
   pinned = false;
   reactions = {};
   replies = [];
-  role_mentions = [];
   constructor(client, data) {
     super(client, data);
     this.authorId = data.author;
@@ -415,10 +490,9 @@ var Message = class extends Base {
       this.attachments = data.attachments.map((fileData) => new Attachment(this.client, fileData));
     }
     if (data.masquerade !== void 0) this.masquerade = data.masquerade;
-    if (data.mentions !== void 0) this.mentions = data.mentions;
     if (data.replies !== void 0) this.replies = data.replies;
-    if (data.role_mentions !== void 0) this.role_mentions = data.role_mentions;
     this._patch(data);
+    this.mentions = new MessageMentions(client, this, data.mentions ?? null, data.role_mentions ?? null);
   }
   async reply(contentOrOptions) {
     let channel = this.channel;
@@ -573,7 +647,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;
@@ -592,7 +666,7 @@ var Message = class extends Base {
     }
   }
   // This tells Node.js exactly how to print this object in console.log()
-  [util2.inspect.custom](depth, options, inspect12) {
+  [util3.inspect.custom](depth, options, inspect12) {
     const { client, authorId, channelId, ...props } = this;
     const data = {
       ...props,
@@ -606,24 +680,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;
@@ -657,7 +713,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) {
@@ -737,6 +793,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)}`));
@@ -763,6 +820,15 @@ var GatewayManager = class {
             }
           }
         }
+        if (payload.members) {
+          for (const rawMember of payload.members) {
+            const server = this.client.servers.cache.get(rawMember._id.server);
+            const user = this.client.users.cache.get(rawMember._id.user);
+            if (server && user) {
+              server.members._add({ ...rawMember, user });
+            }
+          }
+        }
         if (payload.emojis) {
           for (const rawEmoji of payload.emojis) {
             const emoji = this.client.emojis._add(rawEmoji);
@@ -814,7 +880,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;
@@ -954,13 +1020,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": {
@@ -994,7 +1075,8 @@ var GatewayManager = class {
         break;
       }
       default:
-        this.client.emit("raw", payload);
+        this.client.emit("debug", `Unhandled Gateway Event Type: ${eventType}`);
+        break;
     }
   }
   startPingLoop() {
@@ -1040,6 +1122,96 @@ var GatewayManager = class {
 
 // src/rest/RESTManager.ts
 import { request } from "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;
@@ -1086,9 +1258,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;
@@ -1102,17 +1290,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);
@@ -1193,25 +1399,25 @@ 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);
   }
 };
 
 // src/managers/MessageManager.ts
-import * as util3 from "util";
+import * as util4 from "util";
 
 // src/managers/BaseManager.ts
 var BaseManager = class {
@@ -1284,7 +1490,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
@@ -1309,20 +1515,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();
@@ -1343,18 +1560,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 (payload.attachments) {
-      payload.attachments = await Promise.all(
-        payload.attachments.map(
-          (attachment) => resolveAttachment(this.client.rest, attachment, "attachments")
-        )
+    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);
@@ -1367,19 +1585,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.
@@ -1396,7 +1615,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;
   }
@@ -1442,12 +1661,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
@@ -1461,7 +1682,7 @@ var MessageManager = class extends BaseManager {
     const id = this.resolveId(message);
     await this.client.rest.delete(`/channels/${this.channel.id}/messages/${id}/reactions`);
   }
-  [util3.inspect.custom]() {
+  [util4.inspect.custom]() {
     return this.cache;
   }
 };
@@ -1498,6 +1719,8 @@ var MessageCollector = class extends Collector {
     super.handleCollect(message);
     if (!this.ended && this.collected.has(message.id)) {
       this.total++;
+    }
+    if (!this.ended) {
       this.checkEnd();
     }
   }
@@ -1510,12 +1733,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;
@@ -1639,13 +1856,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";
   }
 };
 
@@ -1665,7 +1882,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;
@@ -1735,6 +1954,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,
@@ -1765,6 +1987,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,
@@ -1876,7 +2101,7 @@ var DMChannel = class extends BaseChannel {
 };
 
 // src/structures/GroupChannel.ts
-import * as util4 from "util";
+import * as util5 from "util";
 var GroupChannel = class extends BaseChannel {
   name;
   ownerId;
@@ -1936,7 +2161,7 @@ var GroupChannel = class extends BaseChannel {
   async setDefaultPermissions(permissions) {
     return await this.client.channels.setDefaultPermissions(this.id, permissions);
   }
-  [util4.inspect.custom](_depth, options, inspect12) {
+  [util5.inspect.custom](_depth, options, inspect12) {
     const { client, ...props } = this;
     return `${this.constructor.name} ${inspect12(
       {
@@ -1952,14 +2177,14 @@ 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);
   }
 }
@@ -2268,7 +2493,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);
@@ -2361,8 +2586,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 = await resolveAttachment(this.client.rest, options.icon, "icons");
+      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);
@@ -2447,7 +2678,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
@@ -2477,12 +2708,12 @@ 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 });
   }
 };
 
 // src/structures/Member.ts
-import * as util5 from "util";
+import * as util6 from "util";
 
 // src/managers/MemberRoleManager.ts
 var MemberRoleManager = class {
@@ -2576,20 +2807,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
@@ -2709,7 +2940,7 @@ var Member = class extends Base {
     await server.members.kick(this.id);
   }
   /** @internal */
-  [util5.inspect.custom](depth, options, inspect12) {
+  [util6.inspect.custom](depth, options, inspect12) {
     const { client, serverId, ...props } = this;
     return `${this.constructor.name} ${inspect12(
       {
@@ -2723,7 +2954,7 @@ var Member = class extends Base {
 };
 
 // src/managers/MemberManager.ts
-import * as util6 from "util";
+import * as util7 from "util";
 var MemberManager = class extends BaseManager {
   constructor(client, server, limit = Infinity) {
     super(client, limit);
@@ -2734,17 +2965,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
@@ -2803,23 +3031,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;
   }
@@ -2897,13 +3124,13 @@ var MemberManager = class extends BaseManager {
     const id = this.resolveId(member);
     await this.client.rest.delete(`/servers/${this.server.id}/bans/${id}`);
   }
-  [util6.inspect.custom]() {
+  [util7.inspect.custom]() {
     return this.cache;
   }
 };
 
 // src/managers/ServerChannelManager.ts
-import * as util7 from "util";
+import * as util8 from "util";
 var ServerChannelManager = class {
   client;
   server;
@@ -2922,24 +3149,30 @@ 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 };
     }
     const data = await this.client.rest.post(`/servers/${this.server.id}/channels`, payload);
     return this.client.channels._add(data);
   }
-  [util7.inspect.custom]() {
+  [util8.inspect.custom]() {
     return this.cache;
   }
 };
 
 // src/structures/Role.ts
-import * as util8 from "util";
+import * as util9 from "util";
 var Role = class extends Base {
   serverId;
   name;
@@ -2959,14 +3192,14 @@ 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 = new Attachment(this.client, data.icon);
+    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;
+          const allowPerms = data.permissions.a ?? 0;
           this._permissions = BigInt(allowPerms);
         } else {
           this._permissions = BigInt(data.permissions);
@@ -3149,14 +3382,14 @@ var Role = class extends Base {
    * Hides the cyclic client reference and raw serverId for a cleaner output.
    * @internal
    */
-  [util8.inspect.custom]() {
+  [util9.inspect.custom]() {
     const { client, serverId, ...props } = this;
-    return `${this.constructor.name} ${util8.inspect(props)}`;
+    return `${this.constructor.name} ${util9.inspect(props)}`;
   }
 };
 
 // src/managers/RoleManager.ts
-import * as util9 from "util";
+import * as util10 from "util";
 var RoleManager = class extends BaseManager {
   /**
    * Manages API methods and caching for server roles.
@@ -3169,7 +3402,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
@@ -3185,7 +3418,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);
@@ -3195,7 +3428,7 @@ var RoleManager = class extends BaseManager {
     this.cache.set(role.id, role);
     return role;
   }
-  [util9.inspect.custom]() {
+  [util10.inspect.custom]() {
     return this.cache;
   }
   /**
@@ -3248,7 +3481,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.
@@ -3313,7 +3546,10 @@ var RoleManager = class extends BaseManager {
       if (options.icon === null) {
         remove.push("Icon");
       } else {
-        payload.icon = await resolveAttachment(this.client.rest, options.icon, "icons");
+        const resolvedIcon = await resolveAttachment(this.client.rest, options.icon, "icons");
+        if (resolvedIcon !== void 0) {
+          payload.icon = resolvedIcon;
+        }
       }
     }
     if (remove.length > 0) {
@@ -3322,7 +3558,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);
   }
   /**
@@ -3398,7 +3635,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;
   }
@@ -3410,7 +3647,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;
   }
@@ -3427,7 +3664,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);
@@ -3437,9 +3674,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);
     }
@@ -3452,7 +3688,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) {
@@ -3524,7 +3760,7 @@ var Emoji = class extends Base {
 };
 
 // src/managers/EmojiManager.ts
-import * as util10 from "util";
+import * as util11 from "util";
 var EmojiManager = class extends BaseManager {
   constructor(client, server, limit = Infinity) {
     super(client, limit);
@@ -3546,7 +3782,7 @@ var EmojiManager = class extends BaseManager {
     const data = await this.client.rest.get(`/custom/emoji/${id}`);
     return this._add(data);
   }
-  [util10.inspect.custom]() {
+  [util11.inspect.custom]() {
     return this.cache;
   }
 };
@@ -3559,7 +3795,7 @@ var Server = class extends Base {
   ownerId;
   analytics = false;
   banner = null;
-  categories = [];
+  categories = null;
   description = null;
   discoverable = false;
   flags = 0;
@@ -3612,13 +3848,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) {
@@ -3657,7 +3886,7 @@ var Server = class extends Base {
 };
 
 // src/managers/ServerManager.ts
-import * as util11 from "util";
+import * as util12 from "util";
 var ServerManager = class extends BaseManager {
   constructor(client, limit = Infinity) {
     super(client, limit);
@@ -3666,7 +3895,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
@@ -3707,21 +3936,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;
@@ -3730,7 +3957,7 @@ var ServerManager = class extends BaseManager {
     const data = await this.client.rest.patch(`/servers/${serverId}`, payload);
     return this._add(data);
   }
-  [util11.inspect.custom]() {
+  [util12.inspect.custom]() {
     return this.cache;
   }
 };
@@ -3744,7 +3971,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
@@ -3879,7 +4106,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);
   }
   /**
@@ -4039,14 +4266,17 @@ var EmbedBuilder = class {
     return { ...this.data };
   }
 };
+
+// src/index.ts
+import * as API from "stoat-api";
 export {
+  API,
   Attachment,
   AttachmentBuilder,
   Base,
   BaseChannel,
   BitField,
   ChannelManager,
-  ChannelType,
   Client,
   ClientUser,
   Collection,
@@ -4056,6 +4286,7 @@ export {
   Emoji,
   EmojiManager,
   GatewayManager,
+  GroupChannel,
   Member,
   MemberManager,
   Message,
@@ -4076,8 +4307,6 @@ export {
   TextChannel,
   UnknownChannel,
   User,
-  UserManager,
-  UserPresence,
-  UserRelationship
+  UserManager
 };
 //# sourceMappingURL=index.js.map