@stoatx/client 0.5.0 → 0.6.0

package/dist/index.d.cts

@@ -3,6 +3,7 @@ import { APIRoutes, File, User as User$1, Member as Member$1, Channel, Message a
 import * as stoatApi from 'stoat-api';
 export { stoatApi as API };
 import * as util from 'node:util';
+import util__default from 'node:util';
 
 declare class GatewayManager {
     private client;
@@ -1904,6 +1905,30 @@ declare class ReactionCollector extends Collector<string, MessageReaction> {
     endReason(): string | null;
 }
 
+declare class MessageMentions {
+    private readonly client;
+    private readonly message;
+    /** Raw user IDs from the API */
+    readonly userIds: string[];
+    /** Raw role IDs from the API */
+    readonly roleIds: string[];
+    /** Raw channel IDs parsed from message content */
+    readonly channelIds: string[];
+    constructor(client: Client, message: Message, userIds: string[] | null, roleIds: string[] | null);
+    /** Mentioned users resolved from cache */
+    get users(): Collection<string, User>;
+    /** Mentioned members resolved from cache (only in server channels) */
+    get members(): Collection<string, Member>;
+    /** Mentioned roles resolved from cache */
+    get roles(): Collection<string, Role>;
+    /** Mentioned channels resolved from cache */
+    get channels(): Collection<string, BaseChannel>;
+    /** Whether the given user ID is mentioned */
+    has(userId: string): boolean;
+    private static parseChannelIds;
+    [util__default.inspect.custom](depth: number, options: util__default.InspectOptions, inspect: typeof util__default.inspect): string;
+}
+
 interface MessageOptions {
     content?: string;
     embeds?: (TextEmbedData | EmbedBuilder)[];
@@ -1938,11 +1963,10 @@ declare class Message extends Base {
     flags: number;
     interactions: Interaction | null;
     masquerade: Masquerade | null;
-    mentions: string[] | null;
+    mentions: MessageMentions;
     pinned: null | boolean;
     reactions: Record<string, string[]>;
     replies: string[] | null;
-    role_mentions: string[] | null;
     constructor(client: Client, data: Message$1);
     reply(contentOrOptions: string | MessageOptions): Promise<Message>;
     /**
@@ -2132,4 +2156,4 @@ declare class UnknownChannel extends BaseChannel {
     constructor(client: Client, data: Channel);
 }
 
-export { Attachment, AttachmentBuilder, type AttachmentMetadata, Base, BaseChannel, BitField, type BitFieldResolvable, type BotInformation, type CDNTag, type ChannelCreateOptions, type ChannelEditOptions, ChannelManager, type ChannelResolvable, type ChannelRolePermissionOptions, type ChannelType, Client, type ClientEvents, type ClientOptions, ClientUser, Collection, Collector, type CollectorOptions, DMChannel, EmbedBuilder, Emoji, EmojiManager, type EmojiParent, type FetchMembersOptions, GatewayManager, type Interaction, type Masquerade, Member, type MemberBanOptions, type MemberEditOptions, MemberManager, type MemberResolvable, Message, MessageCollector, type MessageCollectorOptions, type MessageFetchOptions, MessageManager, type MessageOptions, MessageReaction, type MessageResolvable, PermissionFlags, type PermissionResolvable, type PermissionString, Permissions, RESTManager, type RawDMChannel, type RawTextChannel, ReactionCollector, type ReactionCollectorOptions, type ReplyIntent, Role, type RoleCreateOptions, type RoleEditOptions, RoleManager, type RolePermissionOptions, type RoleResolvable, Server, ServerChannelManager, type ServerEditOptions, ServerManager, StoatAPIError, SweeperManager, type SweeperOptions, TextChannel, type TextEmbedData, UnknownChannel, User, type UserEditOptions, UserManager, type UserPresence, type UserProfile, type UserRelationShip, type UserResolvable, type UserStatus };
+export { Attachment, AttachmentBuilder, type AttachmentMetadata, Base, BaseChannel, BitField, type BitFieldResolvable, type BotInformation, type CDNTag, type ChannelCreateOptions, type ChannelEditOptions, ChannelManager, type ChannelResolvable, type ChannelRolePermissionOptions, type ChannelType, Client, type ClientEvents, type ClientOptions, ClientUser, Collection, Collector, type CollectorOptions, DMChannel, EmbedBuilder, Emoji, EmojiManager, type EmojiParent, type FetchMembersOptions, GatewayManager, GroupChannel, type Interaction, type Masquerade, Member, type MemberBanOptions, type MemberEditOptions, MemberManager, type MemberResolvable, Message, MessageCollector, type MessageCollectorOptions, type MessageFetchOptions, MessageManager, type MessageOptions, MessageReaction, type MessageResolvable, PermissionFlags, type PermissionResolvable, type PermissionString, Permissions, RESTManager, type RawDMChannel, type RawGroupChannel, type RawTextChannel, ReactionCollector, type ReactionCollectorOptions, type ReplyIntent, Role, type RoleCreateOptions, type RoleEditOptions, RoleManager, type RolePermissionOptions, type RoleResolvable, Server, ServerChannelManager, type ServerEditOptions, ServerManager, StoatAPIError, SweeperManager, type SweeperOptions, TextChannel, type TextEmbedData, UnknownChannel, User, type UserEditOptions, UserManager, type UserPresence, type UserProfile, type UserRelationShip, type UserResolvable, type UserStatus };

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { APIRoutes, File, User as User$1, Member as Member$1, Channel, Message a
 import * as stoatApi from 'stoat-api';
 export { stoatApi as API };
 import * as util from 'node:util';
+import util__default from 'node:util';
 
 declare class GatewayManager {
     private client;
@@ -1904,6 +1905,30 @@ declare class ReactionCollector extends Collector<string, MessageReaction> {
     endReason(): string | null;
 }
 
+declare class MessageMentions {
+    private readonly client;
+    private readonly message;
+    /** Raw user IDs from the API */
+    readonly userIds: string[];
+    /** Raw role IDs from the API */
+    readonly roleIds: string[];
+    /** Raw channel IDs parsed from message content */
+    readonly channelIds: string[];
+    constructor(client: Client, message: Message, userIds: string[] | null, roleIds: string[] | null);
+    /** Mentioned users resolved from cache */
+    get users(): Collection<string, User>;
+    /** Mentioned members resolved from cache (only in server channels) */
+    get members(): Collection<string, Member>;
+    /** Mentioned roles resolved from cache */
+    get roles(): Collection<string, Role>;
+    /** Mentioned channels resolved from cache */
+    get channels(): Collection<string, BaseChannel>;
+    /** Whether the given user ID is mentioned */
+    has(userId: string): boolean;
+    private static parseChannelIds;
+    [util__default.inspect.custom](depth: number, options: util__default.InspectOptions, inspect: typeof util__default.inspect): string;
+}
+
 interface MessageOptions {
     content?: string;
     embeds?: (TextEmbedData | EmbedBuilder)[];
@@ -1938,11 +1963,10 @@ declare class Message extends Base {
     flags: number;
     interactions: Interaction | null;
     masquerade: Masquerade | null;
-    mentions: string[] | null;
+    mentions: MessageMentions;
     pinned: null | boolean;
     reactions: Record<string, string[]>;
     replies: string[] | null;
-    role_mentions: string[] | null;
     constructor(client: Client, data: Message$1);
     reply(contentOrOptions: string | MessageOptions): Promise<Message>;
     /**
@@ -2132,4 +2156,4 @@ declare class UnknownChannel extends BaseChannel {
     constructor(client: Client, data: Channel);
 }
 
-export { Attachment, AttachmentBuilder, type AttachmentMetadata, Base, BaseChannel, BitField, type BitFieldResolvable, type BotInformation, type CDNTag, type ChannelCreateOptions, type ChannelEditOptions, ChannelManager, type ChannelResolvable, type ChannelRolePermissionOptions, type ChannelType, Client, type ClientEvents, type ClientOptions, ClientUser, Collection, Collector, type CollectorOptions, DMChannel, EmbedBuilder, Emoji, EmojiManager, type EmojiParent, type FetchMembersOptions, GatewayManager, type Interaction, type Masquerade, Member, type MemberBanOptions, type MemberEditOptions, MemberManager, type MemberResolvable, Message, MessageCollector, type MessageCollectorOptions, type MessageFetchOptions, MessageManager, type MessageOptions, MessageReaction, type MessageResolvable, PermissionFlags, type PermissionResolvable, type PermissionString, Permissions, RESTManager, type RawDMChannel, type RawTextChannel, ReactionCollector, type ReactionCollectorOptions, type ReplyIntent, Role, type RoleCreateOptions, type RoleEditOptions, RoleManager, type RolePermissionOptions, type RoleResolvable, Server, ServerChannelManager, type ServerEditOptions, ServerManager, StoatAPIError, SweeperManager, type SweeperOptions, TextChannel, type TextEmbedData, UnknownChannel, User, type UserEditOptions, UserManager, type UserPresence, type UserProfile, type UserRelationShip, type UserResolvable, type UserStatus };
+export { Attachment, AttachmentBuilder, type AttachmentMetadata, Base, BaseChannel, BitField, type BitFieldResolvable, type BotInformation, type CDNTag, type ChannelCreateOptions, type ChannelEditOptions, ChannelManager, type ChannelResolvable, type ChannelRolePermissionOptions, type ChannelType, Client, type ClientEvents, type ClientOptions, ClientUser, Collection, Collector, type CollectorOptions, DMChannel, EmbedBuilder, Emoji, EmojiManager, type EmojiParent, type FetchMembersOptions, GatewayManager, GroupChannel, type Interaction, type Masquerade, Member, type MemberBanOptions, type MemberEditOptions, MemberManager, type MemberResolvable, Message, MessageCollector, type MessageCollectorOptions, type MessageFetchOptions, MessageManager, type MessageOptions, MessageReaction, type MessageResolvable, PermissionFlags, type PermissionResolvable, type PermissionString, Permissions, RESTManager, type RawDMChannel, type RawGroupChannel, type RawTextChannel, ReactionCollector, type ReactionCollectorOptions, type ReplyIntent, Role, type RoleCreateOptions, type RoleEditOptions, RoleManager, type RolePermissionOptions, type RoleResolvable, Server, ServerChannelManager, type ServerEditOptions, ServerManager, StoatAPIError, SweeperManager, type SweeperOptions, TextChannel, type TextEmbedData, UnknownChannel, User, type UserEditOptions, UserManager, type UserPresence, type UserProfile, type UserRelationShip, type UserResolvable, type UserStatus };

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 {
@@ -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 = null;
+  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;
@@ -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,
@@ -746,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);
@@ -1334,7 +1417,7 @@ var RESTManager = class {
 };
 
 // src/managers/MessageManager.ts
-import * as util3 from "util";
+import * as util4 from "util";
 
 // src/managers/BaseManager.ts
 var BaseManager = class {
@@ -1599,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;
   }
 };
@@ -1636,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();
     }
   }
@@ -2016,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;
@@ -2076,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(
       {
@@ -2628,7 +2713,7 @@ var ChannelManager = class extends BaseManager {
 };
 
 // src/structures/Member.ts
-import * as util5 from "util";
+import * as util6 from "util";
 
 // src/managers/MemberRoleManager.ts
 var MemberRoleManager = class {
@@ -2855,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(
       {
@@ -2869,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);
@@ -3039,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;
@@ -3081,13 +3166,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
-import * as util8 from "util";
+import * as util9 from "util";
 var Role = class extends Base {
   serverId;
   name;
@@ -3297,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.
@@ -3343,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;
   }
   /**
@@ -3675,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);
@@ -3697,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;
   }
 };
@@ -3801,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);
@@ -3872,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;
   }
 };
@@ -4201,6 +4286,7 @@ export {
   Emoji,
   EmojiManager,
   GatewayManager,
+  GroupChannel,
   Member,
   MemberManager,
   Message,