discord-html-transcripts-fix 1.3.0 → 1.6.0

package/dist/generator/renderers/systemMessage.js

@@ -16,6 +16,7 @@ async function SystemMessage({ message, context }) {
     const author = message.author;
     const authorName = author?.displayName ?? author?.username ?? 'Unknown';
     const color = message.member?.roles?.color?.hexColor;
+    const authorId = author?.id;
     const ctx = context || {};
 
     switch (message.type) {
@@ -25,12 +26,31 @@ async function SystemMessage({ message, context }) {
 
         case discord_js_1.MessageType.ChannelPinnedMessage: {
             const refId = message.reference?.messageId;
-            return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "pin", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
-                ' ',
-                (0, jsx_runtime_1.jsx)("span", { "data-i18n": "pinned", children: t(ctx, 'pinned', 'pinned a message to this channel.') }),
-                refId ? (0, jsx_runtime_1.jsx)("i", { "data-goto": refId, className: "dht-jump", role: "button", tabIndex: 0, children: " (jump)" }) : null,
-            ] }, message.id));
+            // Discord renders this as: "{user} pinned {a message} to this channel."
+            // where "a message" is the clickable jump link. The i18n key `pinned`
+            // accepts a `{message}` placeholder; if absent (legacy dict), we fall
+            // back to flat text + a trailing " (jump)".
+            const template = t(ctx, 'pinned', 'pinned {message} to this channel.');
+            const linkLabel = t(ctx, 'pinnedLink', 'a message');
+            const linkEl = refId
+                ? (0, jsx_runtime_1.jsx)("i", { "data-goto": refId, className: "dht-jump", role: "button", tabIndex: 0, children: linkLabel })
+                : (0, jsx_runtime_1.jsx)("strong", { children: linkLabel });
+            const parts = template.includes('{message}') ? template.split('{message}') : null;
+            return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "pin", children: parts
+                ? [
+                    (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
+                    ' ',
+                    parts[0],
+                    linkEl,
+                    parts[1],
+                ]
+                : [
+                    (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
+                    ' ',
+                    (0, jsx_runtime_1.jsx)("span", { "data-i18n": "pinned", children: template }),
+                    refId ? (0, jsx_runtime_1.jsx)("i", { "data-goto": refId, className: "dht-jump", role: "button", tabIndex: 0, children: " (jump)" }) : null,
+                ]
+            }, message.id));
         }
 
         case discord_js_1.MessageType.GuildBoost:
@@ -38,7 +58,7 @@ async function SystemMessage({ message, context }) {
         case discord_js_1.MessageType.GuildBoostTier2:
         case discord_js_1.MessageType.GuildBoostTier3:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "boost", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "boosted", children: t(ctx, 'boosted', 'boosted the server!') }),
             ] }, message.id));
@@ -48,7 +68,7 @@ async function SystemMessage({ message, context }) {
             const refId = message.reference?.messageId;
             const label = message.content || 'New thread';
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "thread", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "threadStarted", children: t(ctx, 'threadStarted', 'started a thread:') }),
                 ' ',
@@ -60,7 +80,7 @@ async function SystemMessage({ message, context }) {
 
         case discord_js_1.MessageType.ChannelNameChange:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "edit", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "changedChannelName", children: t(ctx, 'changedChannelName', 'changed the channel name:') }),
                 ' ',
@@ -69,7 +89,7 @@ async function SystemMessage({ message, context }) {
 
         case discord_js_1.MessageType.ChannelIconChange:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "edit", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "changedChannelIcon", children: t(ctx, 'changedChannelIcon', 'changed the channel icon.') }),
             ] }, message.id));
@@ -78,7 +98,7 @@ async function SystemMessage({ message, context }) {
         case discord_js_1.MessageType.ContextMenuCommand: {
             const cmd = message.interaction?.commandName ? '/' + message.interaction.commandName : 'a command';
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "call", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "usedCommand", children: t(ctx, 'usedCommand', 'used') }),
                 ' ',
@@ -88,7 +108,7 @@ async function SystemMessage({ message, context }) {
 
         case discord_js_1.MessageType.Call:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "call", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "startedCall", children: t(ctx, 'startedCall', 'started a call.') }),
             ] }, message.id));
@@ -97,7 +117,7 @@ async function SystemMessage({ message, context }) {
             const followText = t(ctx, 'addedFollow', 'added {target} to follow this channel.');
             const parts = followText.split('{target}');
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "edit", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 parts[0],
                 (0, jsx_runtime_1.jsxs)("span", { className: "dht-mention dht-mention--channel", children: ['#', message.content || 'channel'] }),
@@ -107,7 +127,7 @@ async function SystemMessage({ message, context }) {
 
         case discord_js_1.MessageType.RecipientRemove:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "leave", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 (0, jsx_runtime_1.jsx)("span", { "data-i18n": "left", children: t(ctx, 'left', 'left.') }),
             ] }, message.id));
@@ -132,34 +152,34 @@ async function SystemMessage({ message, context }) {
         }
         case discord_js_1.MessageType.StageStart:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "call", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' started a stage: ',
                 (0, jsx_runtime_1.jsx)("strong", { children: message.content || '' })
             ] }, message.id));
         case discord_js_1.MessageType.StageEnd:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "leave", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ended the stage.'
             ] }, message.id));
         case discord_js_1.MessageType.StageSpeaker:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "call", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' is now a speaker.'
             ] }, message.id));
         case discord_js_1.MessageType.StageRaiseHand:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "call", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' requested to speak.'
             ] }, message.id));
         case discord_js_1.MessageType.StageTopic:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "edit", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' changed the stage topic: ',
                 (0, jsx_runtime_1.jsx)("strong", { children: message.content || '' })
             ] }, message.id));
         case discord_js_1.MessageType.GuildApplicationPremiumSubscription:
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "boost", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' subscribed ',
                 (0, jsx_runtime_1.jsx)("strong", { children: message.applicationId ? `app ${message.applicationId}` : 'an app' }),
                 ' to this server.'
@@ -168,7 +188,7 @@ async function SystemMessage({ message, context }) {
         case discord_js_1.MessageType.RoleSubscriptionPurchase: {
             const roleName = message.roleSubscriptionData?.tierName || message.content || 'a role';
             return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "boost", children: [
-                (0, jsx_runtime_1.jsx)(Highlight, { color, children: authorName }),
+                (0, jsx_runtime_1.jsx)(Highlight, { color, userId: authorId, children: authorName }),
                 ' ',
                 t(ctx, 'roleSubPurchased', 'subscribed to {role}!').replace('{role}', roleName),
             ] }, message.id));
@@ -193,9 +213,16 @@ async function SystemMessage({ message, context }) {
     }
 }
 
-function Highlight({ children, color }) {
+function Highlight({ children, color, userId }) {
     const safe = typeof color === 'string' && /^#[0-9a-fA-F]{3,8}$/.test(color) ? color : 'white';
-    return (0, jsx_runtime_1.jsx)("i", { style: { color: safe }, children: children });
+    const props = { style: { color: safe } };
+    // Wire up the user popup the same way mentions and message authors do.
+    if (typeof userId === 'string' && userId) {
+        props.className = 'dht-sys-author';
+        props['data-mention-type'] = 'user';
+        props['data-mention-id'] = userId;
+    }
+    return (0, jsx_runtime_1.jsx)("i", Object.assign({}, props, { children }));
 }
 
 const allJoinMessages = [
@@ -252,11 +279,12 @@ function pickJoinMessage(seed) {
 
 function JoinMessage({ member, fallbackUser, seed, context }) {
     const template = pickJoinMessage(seed);
+    const uid = member?.id || fallbackUser?.id;
     return template
         .split('{user}')
         .flatMap((item, i) => [
             item,
-            (0, jsx_runtime_1.jsx)(Highlight, { color: member?.roles?.color?.hexColor, children: member?.nickname ?? fallbackUser.displayName ?? fallbackUser.username }, i),
+            (0, jsx_runtime_1.jsx)(Highlight, { color: member?.roles?.color?.hexColor, userId: uid, children: member?.nickname ?? fallbackUser.displayName ?? fallbackUser.username }, i),
         ])
         .slice(0, -1);
 }

package/dist/generator/transcript.js

@@ -48,15 +48,35 @@ async function DiscordMessages(_a) {
             dateSeps[idx] && (0, jsx_runtime_1.jsx)("div", { className: "dht-date-sep", children: dateSeps[idx] }, `sep-${idx}`),
             (0, jsx_runtime_1.jsx)(message_1.default, { message: message, context: Object.assign({ messages, channel, callbacks }, options) }, message.id)
         ]),
-        (0, jsx_runtime_1.jsxs)("div", { style: { textAlign: 'center', width: '100%' }, children: [
-            options.footerText
-                ? options.footerText.replaceAll('{number}', messages.length.toString()).replaceAll('{s}', messages.length > 1 ? 's' : '')
-                : `Exported ${messages.length} message${messages.length > 1 ? 's' : ''}.`,
-            ' ',
-            options.poweredBy
-                ? (0, jsx_runtime_1.jsxs)("span", { style: { textAlign: 'center' }, children: ["Powered by ", (0, jsx_runtime_1.jsx)("a", { href: "https://github.com/ItzDerock/discord-html-transcripts", style: { color: 'lightblue' }, children: "discord-html-transcripts" }), "."] })
-                : null
-        ] })
+        renderLegacyFooter(messages, options),
     ] }));
 }
+
+// Legacy "Exported X message(s). Powered by …" line. The new stats footer
+// (see renderStatsFooter in generator/index.js) already shows the message
+// count, so this line is suppressed by default and only renders when:
+//   - options.statsFooter === false (caller opted out of the new footer), or
+//   - options.footerText is explicitly set to a string, or
+//   - options.poweredBy === true (caller wants the credit link).
+function renderLegacyFooter(messages, options) {
+    const statsDisabled = options.statsFooter === false ||
+        (options.statsFooter && options.statsFooter.enabled === false);
+    const customText = (typeof options.footerText === 'string' && options.footerText.length > 0)
+        ? options.footerText.replaceAll('{number}', messages.length.toString()).replaceAll('{s}', messages.length > 1 ? 's' : '')
+        : null;
+    const wantsPowered = !!options.poweredBy;
+    // Default render only if stats footer is off AND no custom text was set.
+    const defaultText = statsDisabled && !customText
+        ? `Exported ${messages.length} message${messages.length > 1 ? 's' : ''}.`
+        : null;
+    const shown = customText || defaultText;
+    if (!shown && !wantsPowered) return null;
+    return (0, jsx_runtime_1.jsxs)("div", { style: { textAlign: 'center', width: '100%' }, children: [
+        shown,
+        shown && wantsPowered ? ' ' : null,
+        wantsPowered
+            ? (0, jsx_runtime_1.jsxs)("span", { style: { textAlign: 'center' }, children: ["Powered by ", (0, jsx_runtime_1.jsx)("a", { href: "https://github.com/ItzDerock/discord-html-transcripts", style: { color: 'lightblue' }, children: "discord-html-transcripts" }), "."] })
+            : null
+    ] });
+}
 //# sourceMappingURL=transcript.js.map