discord-html-transcripts-fix 1.1.0 → 1.2.0

package/dist/utils/buildProfiles.js

@@ -2,75 +2,47 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildProfiles = buildProfiles;
 exports.buildExtendedContext = buildExtendedContext;
+exports.buildAllContext = buildAllContext;
 const discord_js_1 = require("discord.js");
 
 /**
- * Original profile builder — kept for backwards compatibility with
- * <discord-mention> web component lookups via window.$discordMessage.profiles.
+ * Backwards compatible: returns the profile dict used by <discord-mention> web components.
  */
 async function buildProfiles(messages) {
-    const profiles = {};
-    for (const message of messages) {
-        const author = message.author;
-        if (author && !profiles[author.id]) {
-            profiles[author.id] = buildProfile(message.member, author);
-        }
-        if (message.interaction) {
-            const user = message.interaction.user;
-            if (user && !profiles[user.id]) {
-                profiles[user.id] = buildProfile(null, user);
-            }
-        }
-        if (message.thread && message.thread.lastMessage && message.thread.lastMessage.author) {
-            profiles[message.thread.lastMessage.author.id] = buildProfile(message.thread.lastMessage.member, message.thread.lastMessage.author);
-        }
-        // Also include users mentioned in messages — so popups work even if they never spoke
-        if (message.mentions && message.mentions.users) {
-            for (const [uid, u] of message.mentions.users) {
-                if (!profiles[uid]) {
-                    const member = message.mentions.members && message.mentions.members.get
-                        ? message.mentions.members.get(uid)
-                        : null;
-                    profiles[uid] = buildProfile(member, u);
-                }
-            }
-        }
-    }
+    const { profiles } = await buildAllContext(messages, null);
     return profiles;
 }
 
-function buildProfile(member, author) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    return {
-        author: (_b = (_a = member === null || member === void 0 ? void 0 : member.nickname) !== null && _a !== void 0 ? _a : author.displayName) !== null && _b !== void 0 ? _b : author.username,
-        avatar: (_c = member === null || member === void 0 ? void 0 : member.displayAvatarURL({ size: 64 })) !== null && _c !== void 0 ? _c : author.displayAvatarURL({ size: 64 }),
-        roleColor: member === null || member === void 0 ? void 0 : member.displayHexColor,
-        roleIcon: (_e = (_d = member === null || member === void 0 ? void 0 : member.roles.icon) === null || _d === void 0 ? void 0 : _d.iconURL()) !== null && _e !== void 0 ? _e : undefined,
-        roleName: (_g = (_f = member === null || member === void 0 ? void 0 : member.roles.hoist) === null || _f === void 0 ? void 0 : _f.name) !== null && _g !== void 0 ? _g : undefined,
-        bot: author.bot,
-        verified: (_h = author.flags) === null || _h === void 0 ? void 0 : _h.has(discord_js_1.UserFlags.VerifiedBot),
-    };
+/**
+ * Backwards compatible: returns extended users/roles/channels.
+ */
+async function buildExtendedContext(messages, channel) {
+    const { users, roles, channels } = await buildAllContext(messages, channel);
+    return { users, roles, channels };
 }
 
 /**
- * Extended dictionaries used by the mention-popup client script.
- * Contains:
- *   users:    full user/member details (avatar, banner color, all roles, joinedAt, createdAt, flags)
- *   roles:    all roles referenced by any rendered user OR mentioned in messages
- *   channels: channel info (name, parent category, topic, type)
+ * Single-pass collector — builds the legacy `profiles` dict AND the extended
+ * users/roles/channels dicts in one go (saves an O(n) pass for big tickets).
  */
-async function buildExtendedContext(messages, channel) {
+async function buildAllContext(messages, channel) {
+    const profiles = {};
     const users = {};
     const roles = {};
     const channels = {};
-    const guild = channel && !channel.isDMBased && !channel.isDMBased() ? channel.guild : null;
+
+    // FIX: previous version was `!channel.isDMBased && !channel.isDMBased()`
+    // which is always false (isDMBased is a truthy function reference).
+    const guild = channel && typeof channel.isDMBased === 'function' && !channel.isDMBased()
+        ? channel.guild
+        : null;
 
     const seenUserIds = new Set();
     const seenRoleIds = new Set();
     const seenChannelIds = new Set();
 
     const includeRoleFromGuild = (roleId) => {
-        if (!guild || seenRoleIds.has(roleId)) return;
+        if (!guild || !roleId || seenRoleIds.has(roleId)) return;
         const role = guild.roles.cache.get(roleId);
         if (!role) return;
         seenRoleIds.add(roleId);
@@ -87,7 +59,7 @@ async function buildExtendedContext(messages, channel) {
     };
 
     const includeChannelFromGuild = (channelId) => {
-        if (!guild || seenChannelIds.has(channelId)) return;
+        if (!guild || !channelId || seenChannelIds.has(channelId)) return;
         const ch = guild.channels.cache.get(channelId);
         if (!ch) return;
         seenChannelIds.add(channelId);
@@ -102,16 +74,32 @@ async function buildExtendedContext(messages, channel) {
     };
 
     const includeUser = (member, author) => {
-        if (!author || seenUserIds.has(author.id)) return;
-        seenUserIds.add(author.id);
+        if (!author) return;
+        const id = author.id;
+        if (seenUserIds.has(id)) return;
+        seenUserIds.add(id);
+
+        // legacy profile (used by <discord-mention>)
+        profiles[id] = {
+            author: member?.nickname ?? author.displayName ?? author.username,
+            avatar: member?.displayAvatarURL?.({ size: 64 }) ?? author.displayAvatarURL?.({ size: 64 }),
+            roleColor: member?.displayHexColor,
+            roleIcon: member?.roles?.icon?.iconURL?.() ?? undefined,
+            roleName: member?.roles?.hoist?.name ?? undefined,
+            bot: !!author.bot,
+            verified: author.flags?.has?.(discord_js_1.UserFlags.VerifiedBot) ?? false,
+        };
+
+        // extended record (used by popup)
         const memberRoles = member && member.roles && member.roles.cache
-            ? Array.from(member.roles.cache.values()).filter((r) => r.id !== guild?.id)
+            ? Array.from(member.roles.cache.values())
+                .filter((r) => r.id !== guild?.id)
                 .sort((a, b) => b.position - a.position)
             : [];
-        // include role records as well
         for (const r of memberRoles) includeRoleFromGuild(r.id);
-        users[author.id] = {
-            id: author.id,
+
+        users[id] = {
+            id,
             username: author.username,
             displayName: member?.nickname || author.displayName || author.username,
             globalName: author.globalName || null,
@@ -142,9 +130,7 @@ async function buildExtendedContext(messages, channel) {
         if (message.mentions) {
             if (message.mentions.users) {
                 for (const [uid, u] of message.mentions.users) {
-                    const member = message.mentions.members && message.mentions.members.get
-                        ? message.mentions.members.get(uid)
-                        : null;
+                    const member = message.mentions.members?.get?.(uid) || null;
                     includeUser(member, u);
                 }
             }
@@ -155,8 +141,14 @@ async function buildExtendedContext(messages, channel) {
                 for (const [cid] of message.mentions.channels) includeChannelFromGuild(cid);
             }
         }
+        // also include authors of forwarded snapshots
+        if (Array.isArray(message.messageSnapshots)) {
+            for (const snap of message.messageSnapshots) {
+                if (snap?.author) includeUser(null, snap.author);
+            }
+        }
     }
 
-    return { users, roles, channels };
+    return { profiles, users, roles, channels };
 }
 //# sourceMappingURL=buildProfiles.js.map

package/dist/utils/utils.js

@@ -7,46 +7,49 @@ exports.isDefined = isDefined;
 exports.formatBytes = formatBytes;
 exports.parseDiscordEmoji = parseDiscordEmoji;
 exports.streamToString = streamToString;
+exports.safeJsonForScript = safeJsonForScript;
+exports.safeHref = safeHref;
+exports.safeColor = safeColor;
+exports.safeImageMime = safeImageMime;
+exports.escapeHtml = escapeHtml;
 const twemoji_1 = __importDefault(require("twemoji"));
+
 function isDefined(value) {
     return value !== undefined && value !== null;
 }
-/**
- * Returns a tuple of [bytes (i.e. 1024), bytesUnit (i.e. KB)]
- * @param bytes
- * @param decimals
- * @returns
- */
+
 function formatBytes(bytes, decimals = 2) {
-    if (bytes === 0)
-        return [0, 'Bytes'];
+    if (!bytes || !Number.isFinite(bytes)) return [0, 'Bytes'];
     const k = 1024;
     const dm = decimals < 0 ? 0 : decimals;
     const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    const i = Math.min(sizes.length - 1, Math.max(0, Math.floor(Math.log(bytes) / Math.log(k))));
     return [parseFloat((bytes / Math.pow(k, i)).toFixed(dm)), sizes[i]];
 }
+
+const emojiCache = new Map();
 function parseDiscordEmoji(emoji) {
     if (!emoji) return '';
+    const key = emoji.id || emoji.name;
+    if (!key) return '';
+    if (emojiCache.has(key)) return emojiCache.get(key);
+    let url = '';
     if (emoji.id) {
-        return `https://cdn.discordapp.com/emojis/${emoji.id}.${emoji.animated ? 'gif' : 'png'}`;
-    }
-    // Defensive: emoji.name may be null for deleted/unknown reactions
-    if (typeof emoji.name !== 'string' || !emoji.name) return '';
-    try {
-        const codepoints = twemoji_1.default.convert
-            .toCodePoint(emoji.name.indexOf(String.fromCharCode(0x200d)) < 0 ? emoji.name.replace(/\uFE0F/g, '') : emoji.name)
-            .toLowerCase();
-        return `https://cdnjs.cloudflare.com/ajax/libs/twemoji/14.0.2/svg/${codepoints}.svg`;
-    }
-    catch (_e) {
-        return '';
+        url = `https://cdn.discordapp.com/emojis/${emoji.id}.${emoji.animated ? 'gif' : 'png'}`;
+    } else if (typeof emoji.name === 'string' && emoji.name) {
+        try {
+            const codepoints = twemoji_1.default.convert
+                .toCodePoint(emoji.name.indexOf(String.fromCharCode(0x200d)) < 0 ? emoji.name.replace(/️/g, '') : emoji.name)
+                .toLowerCase();
+            url = `https://cdnjs.cloudflare.com/ajax/libs/twemoji/14.0.2/svg/${codepoints}.svg`;
+        } catch (_e) {
+            url = '';
+        }
     }
+    emojiCache.set(key, url);
+    return url;
 }
-/**
- * Converts a stream to a string
- * @param stream - The stream to convert
- */
+
 function streamToString(stream) {
     const chunks = [];
     return new Promise((resolve, reject) => {
@@ -55,4 +58,48 @@ function streamToString(stream) {
         stream.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')));
     });
 }
-//# sourceMappingURL=utils.js.map
+
+/**
+ * JSON.stringify safe to embed in <script>. Escapes <, >, &, U+2028, U+2029.
+ */
+function safeJsonForScript(obj) {
+    return JSON.stringify(obj)
+        .replace(/</g, '\\u003c')
+        .replace(/>/g, '\\u003e')
+        .replace(/&/g, '\\u0026')
+        .replace(/\u2028/g, '\\u2028')
+        .replace(/\u2029/g, '\\u2029');
+}
+
+function safeHref(url) {
+    if (typeof url !== 'string' || !url) return '#';
+    try {
+        const u = new URL(url, 'https://example.invalid');
+        const proto = u.protocol.toLowerCase();
+        if (proto === 'http:' || proto === 'https:' || proto === 'mailto:' || proto === 'discord:') return url;
+        return '#';
+    } catch (_e) {
+        return '#';
+    }
+}
+
+function safeColor(c, fallback = '#5865F2') {
+    if (typeof c !== 'string') return fallback;
+    return /^#[0-9a-fA-F]{3,8}$/.test(c) ? c : fallback;
+}
+
+const ALLOWED_IMAGE_MIME = new Set([
+    'image/png', 'image/jpeg', 'image/jpg', 'image/gif', 'image/webp', 'image/avif', 'image/svg+xml',
+]);
+function safeImageMime(mime, fallback = 'image/png') {
+    if (typeof mime !== 'string') return fallback;
+    const m = mime.split(';')[0].trim().toLowerCase();
+    return ALLOWED_IMAGE_MIME.has(m) ? m : fallback;
+}
+
+function escapeHtml(str) {
+    return String(str == null ? '' : str).replace(/[&<>"']/g, (c) => ({
+        '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;'
+    }[c]));
+}
+//# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-html-transcripts-fix",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A nicely formatted html transcript generator for discord.js. Bugfix fork with support for the latest discord.js and Components v2.",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",