@stoatx/client 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -46,6 +46,7 @@ __export(index_exports, {
   Emoji: () => Emoji,
   EmojiManager: () => EmojiManager,
   GatewayManager: () => GatewayManager,
+  GroupChannel: () => GroupChannel,
   Member: () => Member,
   MemberManager: () => MemberManager,
   Message: () => Message,
@@ -112,7 +113,7 @@ var Base = class _Base {
 };
 
 // src/structures/Message.ts
-var util2 = __toESM(require("util"), 1);
+var util3 = __toESM(require("util"), 1);
 
 // src/structures/Attachment.ts
 var Attachment = class extends Base {
@@ -458,6 +459,82 @@ var ReactionCollector = class extends Collector {
   }
 };
 
+// src/structures/MessageMentions.ts
+var import_node_util = __toESM(require("util"), 1);
+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]] : []);
+  }
+  [import_node_util.default.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;
@@ -470,11 +547,10 @@ var Message = class extends Base {
   flags = 0;
   interactions = null;
   masquerade = null;
-  mentions = null;
+  mentions;
   pinned = false;
   reactions = {};
   replies = [];
-  role_mentions = [];
   constructor(client, data) {
     super(client, data);
     this.authorId = data.author;
@@ -487,10 +563,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;
@@ -664,7 +739,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,
@@ -818,6 +893,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);
@@ -1406,7 +1490,7 @@ var RESTManager = class {
 };
 
 // src/managers/MessageManager.ts
-var util3 = __toESM(require("util"), 1);
+var util4 = __toESM(require("util"), 1);
 
 // src/managers/BaseManager.ts
 var BaseManager = class {
@@ -1671,7 +1755,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;
   }
 };
@@ -1708,6 +1792,8 @@ var MessageCollector = class extends Collector {
     super.handleCollect(message);
     if (!this.ended && this.collected.has(message.id)) {
       this.total++;
+    }
+    if (!this.ended) {
       this.checkEnd();
     }
   }
@@ -2088,7 +2174,7 @@ var DMChannel = class extends BaseChannel {
 };
 
 // src/structures/GroupChannel.ts
-var util4 = __toESM(require("util"), 1);
+var util5 = __toESM(require("util"), 1);
 var GroupChannel = class extends BaseChannel {
   name;
   ownerId;
@@ -2148,7 +2234,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(
       {
@@ -2700,7 +2786,7 @@ var ChannelManager = class extends BaseManager {
 };
 
 // src/structures/Member.ts
-var util5 = __toESM(require("util"), 1);
+var util6 = __toESM(require("util"), 1);
 
 // src/managers/MemberRoleManager.ts
 var MemberRoleManager = class {
@@ -2927,7 +3013,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(
       {
@@ -2941,7 +3027,7 @@ var Member = class extends Base {
 };
 
 // src/managers/MemberManager.ts
-var util6 = __toESM(require("util"), 1);
+var util7 = __toESM(require("util"), 1);
 var MemberManager = class extends BaseManager {
   constructor(client, server, limit = Infinity) {
     super(client, limit);
@@ -3111,13 +3197,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
-var util7 = __toESM(require("util"), 1);
+var util8 = __toESM(require("util"), 1);
 var ServerChannelManager = class {
   client;
   server;
@@ -3153,13 +3239,13 @@ var ServerChannelManager = class {
     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
-var util8 = __toESM(require("util"), 1);
+var util9 = __toESM(require("util"), 1);
 var Role = class extends Base {
   serverId;
   name;
@@ -3369,14 +3455,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
-var util9 = __toESM(require("util"), 1);
+var util10 = __toESM(require("util"), 1);
 var RoleManager = class extends BaseManager {
   /**
    * Manages API methods and caching for server roles.
@@ -3415,7 +3501,7 @@ var RoleManager = class extends BaseManager {
     this.cache.set(role.id, role);
     return role;
   }
-  [util9.inspect.custom]() {
+  [util10.inspect.custom]() {
     return this.cache;
   }
   /**
@@ -3747,7 +3833,7 @@ var Emoji = class extends Base {
 };
 
 // src/managers/EmojiManager.ts
-var util10 = __toESM(require("util"), 1);
+var util11 = __toESM(require("util"), 1);
 var EmojiManager = class extends BaseManager {
   constructor(client, server, limit = Infinity) {
     super(client, limit);
@@ -3769,7 +3855,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;
   }
 };
@@ -3873,7 +3959,7 @@ var Server = class extends Base {
 };
 
 // src/managers/ServerManager.ts
-var util11 = __toESM(require("util"), 1);
+var util12 = __toESM(require("util"), 1);
 var ServerManager = class extends BaseManager {
   constructor(client, limit = Infinity) {
     super(client, limit);
@@ -3944,7 +4030,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;
   }
 };
@@ -4274,6 +4360,7 @@ var API = __toESM(require("stoat-api"), 1);
   Emoji,
   EmojiManager,
   GatewayManager,
+  GroupChannel,
   Member,
   MemberManager,
   Message,