discord-message-transcript 1.1.4 → 1.1.6-dev.0

package/dist/core/fetchMessages.js

@@ -109,7 +109,7 @@ export async function fetchMessages(channel, options, authors, mentions, after)
             });
         }
         const components = await componentsToJson(message.components, options);
-        getMentions(message, mentions);
+        await getMentions(message, mentions);
         return {
             attachments: options.includeAttachments ? attachments : [],
             authorId: message.author.id,

package/dist/core/getMentions.d.ts

@@ -1,3 +1,3 @@
 import { Message } from "discord.js";
 import { MapMentions } from "../types/types.js";
-export declare function getMentions(message: Message, mentions: MapMentions): void;
+export declare function getMentions(message: Message, mentions: MapMentions): Promise<void>;

package/dist/core/getMentions.js

@@ -1,5 +1,5 @@
 import { ChannelType } from "discord.js";
-export function getMentions(message, mentions) {
+export async function getMentions(message, mentions) {
     message.mentions.channels.forEach(channel => {
         if (!mentions.channels.has(channel.id)) {
             mentions.channels.set(channel.id, {
@@ -17,8 +17,6 @@ export function getMentions(message, mentions) {
             });
         }
     });
-    if (message.guild) {
-    }
     if (message.mentions.members) {
         message.mentions.members.forEach(member => {
             if (!mentions.users.has(member.id)) {
@@ -41,59 +39,70 @@ export function getMentions(message, mentions) {
             }
         });
     }
-    fetchRoleMention(message, mentions);
-    fetchChannelMention(message, mentions);
-    fetchUserMention(message, mentions);
+    await Promise.all([fetchRoleMention(message, mentions), fetchChannelMention(message, mentions), fetchUserMention(message, mentions)]);
 }
-// Needs to fix that sometimes discord laks to provide all roles mentions in a message
-function fetchRoleMention(message, mentions) {
-    const roleIds = [];
+// Discord sometimes lacks role mentions in message.mentions
+async function fetchRoleMention(message, mentions) {
+    const roleIds = new Set();
     for (const match of message.content.matchAll(/<@&(\d+)>/g)) {
         const roleId = match[1];
-        if (roleId && !roleIds.includes(roleId) && !mentions.roles.has(roleId)) {
-            roleIds.push(roleId);
+        if (roleId && !mentions.roles.has(roleId)) {
+            roleIds.add(roleId);
         }
     }
-    roleIds.forEach(async (id) => {
-        const role = await message.guild?.roles.fetch(id);
-        if (!role)
-            return;
-        mentions.roles.set(role.id, { id: role.id, color: role.hexColor, name: role.name });
-    });
+    for (const id of roleIds) {
+        try {
+            const role = await message.guild?.roles.fetch(id);
+            if (!role)
+                continue;
+            mentions.roles.set(role.id, { id: role.id, color: role.hexColor, name: role.name });
+        }
+        catch { } // Role may not exist
+    }
 }
-function fetchUserMention(message, mentions) {
-    const usersId = [];
+async function fetchUserMention(message, mentions) {
+    const usersId = new Set();
     for (const match of message.content.matchAll(/<@(\d+)>/g)) {
         const userId = match[1];
-        if (userId && !usersId.includes(userId) && !mentions.roles.has(userId)) {
-            usersId.push(userId);
+        if (userId && !mentions.users.has(userId)) {
+            usersId.add(userId);
         }
     }
-    usersId.forEach(async (id) => {
+    for (const id of usersId) {
         if (message.guild) {
-            const user = await message.guild.members.fetch(id);
+            try {
+                const user = await message.guild.members.fetch(id);
+                if (user) {
+                    mentions.users.set(user.id, { id: user.id, color: user.displayHexColor, name: user.displayName });
+                    continue; // Continue inside if to allow fallback to regular user fetch
+                }
+            }
+            catch { } // Member may not exist
+        }
+        try {
+            const user = await message.client.users.fetch(id);
             if (!user)
-                return;
-            mentions.users.set(user.id, { id: user.id, color: user.displayHexColor, name: user.displayName });
+                continue;
+            mentions.users.set(user.id, { id: user.id, color: message.guild ? null : user.hexAccentColor ?? null, name: user.displayName });
         }
-        const user = await message.client.users.fetch(id);
-        if (!user)
-            return;
-        mentions.users.set(user.id, { id: user.id, color: user.hexAccentColor ?? null, name: user.displayName });
-    });
+        catch { } // User may not exist
+    }
 }
-function fetchChannelMention(message, mentions) {
-    const channelIds = [];
+async function fetchChannelMention(message, mentions) {
+    const channelIds = new Set();
     for (const match of message.content.matchAll(/<#(\d+)>/g)) {
         const channelId = match[1];
-        if (channelId && !channelIds.includes(channelId) && !mentions.channels.has(channelId)) {
-            channelIds.push(channelId);
+        if (channelId && !mentions.channels.has(channelId)) {
+            channelIds.add(channelId);
         }
     }
-    channelIds.forEach(async (id) => {
-        const channel = await message.guild?.channels.fetch(id);
-        if (!channel)
-            return;
-        mentions.channels.set(channel.id, { id: channel.id, name: channel.name });
-    });
+    for (const id of channelIds) {
+        try {
+            const channel = await message.guild?.channels.fetch(id);
+            if (!channel)
+                continue;
+            mentions.channels.set(channel.id, { id: channel.id, name: channel.name });
+        }
+        catch { } // Channel may not exist
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-message-transcript",
-  "version": "1.1.4",
+  "version": "1.1.6-dev.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -48,7 +48,7 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "discord-message-transcript-base": "^1.1.4"
+    "discord-message-transcript-base": "1.1.6-dev.0"
   },
   "peerDependencies": {
     "discord.js": ">=14.19.0 <15"