discord-html-transcripts-fix 1.0.0 → 1.2.0

package/dist/generator/renderers/message.js

@@ -38,6 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = DiscordMessage;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const discord_js_1 = require("discord.js");
 const utils_1 = require("../../utils/utils");
 const attachment_1 = require("./attachment");
 const components_1 = __importDefault(require("./components"));
@@ -45,15 +46,203 @@ const content_1 = __importStar(require("./content"));
 const embed_1 = require("./embed");
 const reply_1 = __importDefault(require("./reply"));
 const systemMessage_1 = __importDefault(require("./systemMessage"));
-async function DiscordMessage({ message, context, }) {
-    var _a;
-    if (message.system)
-        return (0, jsx_runtime_1.jsx)(systemMessage_1.default, { message: message });
-    const isCrosspost = message.reference && message.reference.guildId !== ((_a = message.guild) === null || _a === void 0 ? void 0 : _a.id);
-    return ((0, jsx_runtime_1.jsxs)("discord-message", { id: `m-${message.id}`, timestamp: message.createdAt, edited: message.editedAt !== null, server: isCrosspost !== null && isCrosspost !== void 0 ? isCrosspost : undefined, highlight: message.mentions.everyone, profile: message.author.id, children: [(0, jsx_runtime_1.jsx)(reply_1.default, { message: message, context: context }), message.interaction && ((0, jsx_runtime_1.jsx)("discord-command", { slot: "reply", profile: message.interaction.user.id, command: '/' + message.interaction.commandName })), message.content && ((0, jsx_runtime_1.jsx)(content_1.default, { content: message.content, context: Object.assign(Object.assign({}, context), { type: message.webhookId ? content_1.RenderType.WEBHOOK : content_1.RenderType.NORMAL }) })), (0, jsx_runtime_1.jsx)(attachment_1.Attachments, { message: message, context: context }), message.embeds.map((embed, id) => ((0, jsx_runtime_1.jsx)(embed_1.DiscordEmbed, { embed: embed, context: Object.assign(Object.assign({}, context), { index: id, message }) }, id))), message.components.length > 0 && ((0, jsx_runtime_1.jsx)("discord-attachments", { slot: "components", children: message.components.map((component, id) => ((0, jsx_runtime_1.jsx)(components_1.default, { id: id, component: component, context: context }, id))) })), message.reactions.cache.size > 0 && ((0, jsx_runtime_1.jsx)("discord-reactions", { slot: "reactions", children: message.reactions.cache.map((reaction, id) => ((0, jsx_runtime_1.jsx)("discord-reaction", { name: reaction.emoji.name, emoji: (0, utils_1.parseDiscordEmoji)(reaction.emoji), count: reaction.count }, `${message.id}r${id}`))) })), message.hasThread && message.thread && ((0, jsx_runtime_1.jsx)("discord-thread", { slot: "thread", name: message.thread.name, cta: message.thread.messageCount
-                    ? `${message.thread.messageCount} Message${message.thread.messageCount > 1 ? 's' : ''}`
-                    : 'View Thread', children: message.thread.lastMessage ? ((0, jsx_runtime_1.jsx)("discord-thread-message", { profile: message.thread.lastMessage.author.id, children: (0, jsx_runtime_1.jsx)(content_1.default, { content: message.thread.lastMessage.content.length > 128
-                            ? message.thread.lastMessage.content.substring(0, 125) + '...'
-                            : message.thread.lastMessage.content, context: Object.assign(Object.assign({}, context), { type: content_1.RenderType.REPLY }) }) })) : (`Thread messages not saved.`) }))] }, message.id));
-}
-//# sourceMappingURL=message.js.map
+
+const FLAG_SUPPRESS_EMBEDS = 1 << 2;
+const FLAG_IS_VOICE_MESSAGE = 1 << 13;
+
+function t(context, key, fallback) {
+    const dict = context?.i18n?.[context?.lang] || context?.i18n?.en || {};
+    return dict[key] || fallback || key;
+}
+
+async function DiscordMessage({ message, context }) {
+    try {
+        if (message.system)
+            return (0, jsx_runtime_1.jsx)(systemMessage_1.default, { message: message, context: context });
+
+        const isCrosspost = message.reference && message.reference.guildId !== message.guild?.id;
+        const stickers = message.stickers && message.stickers.size > 0
+            ? Array.from(message.stickers.values()).map((s) => ({
+                id: s.id,
+                name: s.name,
+                url: s.url || `https://media.discordapp.net/stickers/${s.id}.png`,
+                format: s.format,
+            }))
+            : [];
+        const poll = (message.poll && (message.poll.question || (message.poll.answers && message.poll.answers.size))) ? message.poll : null;
+
+        const flags = (typeof message.flags?.bitfield === 'number') ? message.flags.bitfield : 0;
+        const suppressEmbeds = !!(flags & FLAG_SUPPRESS_EMBEDS);
+        const isVoice = !!(flags & FLAG_IS_VOICE_MESSAGE);
+
+        // Forwarded message snapshots (messageSnapshots) — render before the empty body
+        const snapshots = Array.isArray(message.messageSnapshots) ? message.messageSnapshots : [];
+
+        const isApp = !!(message.author?.bot && message.applicationId);
+
+        const editedAtIso = message.editedAt instanceof Date ? message.editedAt.toISOString() : null;
+        const pinned = !!message.pinned;
+
+        return ((0, jsx_runtime_1.jsxs)("discord-message", {
+            id: `m-${message.id}`,
+            timestamp: message.createdAt,
+            edited: message.editedAt !== null,
+            server: isCrosspost ?? undefined,
+            highlight: message.mentions.everyone || pinned,
+            profile: message.author.id,
+            children: [
+                pinned && (0, jsx_runtime_1.jsx)("div", { className: "dht-pinned-indicator", title: "Pinned", children: "📌" }),
+                (0, jsx_runtime_1.jsx)(reply_1.default, { message: message, context: context }),
+                message.interaction && ((0, jsx_runtime_1.jsx)("discord-command", { slot: "reply", profile: message.interaction.user.id, command: '/' + message.interaction.commandName })),
+                isApp && (0, jsx_runtime_1.jsx)("span", { className: "dht-app-badge", "data-i18n": "appBadge", children: t(context, 'appBadge', 'APP') }),
+                editedAtIso && (0, jsx_runtime_1.jsx)("span", { className: "dht-edit-marker", title: editedAtIso, "data-edit-iso": editedAtIso, "data-i18n": "edited", "data-i18n-params": JSON.stringify({ time: editedAtIso }), children: '(' + t(context, 'edited', 'edited') + ')' }),
+                Array.isArray(message.editHistory) && message.editHistory.length > 0 && renderEditHistory(message.editHistory, context),
+                snapshots.length > 0 && renderSnapshots(snapshots, context),
+                message.content && ((0, jsx_runtime_1.jsx)(content_1.default, { content: message.content, context: Object.assign({}, context, { type: message.webhookId ? content_1.RenderType.WEBHOOK : content_1.RenderType.NORMAL }) })),
+                (0, jsx_runtime_1.jsx)(attachment_1.Attachments, { message: message, context: context }),
+                isVoice && renderVoiceIndicator(message, context),
+                stickers.length > 0 && renderStickers(stickers),
+                poll && renderPoll(poll, context),
+                !suppressEmbeds && message.embeds.map((embed, id) => ((0, jsx_runtime_1.jsx)(embed_1.DiscordEmbed, { embed: embed, context: Object.assign({}, context, { index: id, message }) }, id))),
+                suppressEmbeds && message.embeds.length > 0 && (0, jsx_runtime_1.jsx)("span", { className: "dht-suppressed", "data-i18n": "suppressedEmbeds", children: t(context, 'suppressedEmbeds', '(embeds hidden)') }),
+                message.components.length > 0 && ((0, jsx_runtime_1.jsx)("discord-attachments", { slot: "components", children: message.components.map((component, id) => ((0, jsx_runtime_1.jsx)(components_1.default, { id: id, component: component, context: context }, id))) })),
+                message.reactions.cache.size > 0 && ((0, jsx_runtime_1.jsx)("discord-reactions", {
+                    slot: "reactions",
+                    children: Array.from(message.reactions.cache.values()).map((reaction, id) => {
+                        const burst = reaction.burst_count > 0 || (reaction.count_details?.burst > 0);
+                        return ((0, jsx_runtime_1.jsx)("discord-reaction", {
+                            name: reaction.emoji?.name || ':unknown:',
+                            emoji: (0, utils_1.parseDiscordEmoji)(reaction.emoji) || undefined,
+                            count: reaction.count ?? 0,
+                            "data-burst": burst ? 'true' : undefined,
+                            className: burst ? 'dht-reaction--burst' : undefined
+                        }, `${message.id}r${id}`));
+                    })
+                })),
+                message.hasThread && message.thread && renderThread(message.thread, context),
+            ]
+        }, message.id));
+    } catch (err) {
+        console.warn('[discord-html-transcripts-fix] Render failed', message?.id, err?.message || err);
+        const safeAuthor = (message?.author?.displayName || message?.author?.username) || 'Unknown';
+        return ((0, jsx_runtime_1.jsx)("discord-message", { id: `m-${message?.id}`, children: (0, jsx_runtime_1.jsx)("span", { style: { opacity: 0.6 }, children: `[message from ${safeAuthor} failed to render]` }) }, message?.id));
+    }
+}
+
+function renderThread(thread, context) {
+    const cta = thread.messageCount
+        ? `${thread.messageCount} Message${thread.messageCount > 1 ? 's' : ''}`
+        : 'View Thread';
+    const badges = [];
+    if (thread.archived) badges.push((0, jsx_runtime_1.jsx)("span", { className: "dht-thread-badge dht-thread-badge--archived", "data-i18n": "threadArchived", children: t(context, 'threadArchived', 'Archived') }, 'a'));
+    if (thread.locked) badges.push((0, jsx_runtime_1.jsx)("span", { className: "dht-thread-badge dht-thread-badge--locked", "data-i18n": "threadLocked", children: t(context, 'threadLocked', 'Locked') }, 'l'));
+    return (0, jsx_runtime_1.jsxs)("discord-thread", { slot: "thread", name: thread.name, cta, children: [
+        badges,
+        thread.lastMessage
+            ? (0, jsx_runtime_1.jsx)("discord-thread-message", { profile: thread.lastMessage.author.id, children: (0, jsx_runtime_1.jsx)(content_1.default, { content: thread.lastMessage.content.length > 128 ? thread.lastMessage.content.substring(0, 125) + '...' : thread.lastMessage.content, context: Object.assign({}, context, { type: content_1.RenderType.REPLY }) }) })
+            : 'Thread messages not saved.'
+    ] });
+}
+
+function renderStickers(stickers) {
+    return (0, jsx_runtime_1.jsx)("div", {
+        className: "dht-stickers",
+        children: stickers.map((s) => (0, jsx_runtime_1.jsx)("img", {
+            src: s.url,
+            alt: s.name || 'sticker',
+            title: s.name || '',
+            className: "dht-sticker"
+        }, s.id))
+    });
+}
+
+function renderPoll(poll, context) {
+    let totalVotes = 0;
+    const answers = poll.answers ? Array.from(poll.answers.values()) : [];
+    for (const a of answers) totalVotes += a.voteCount || 0;
+    const expires = poll.expiresAt instanceof Date ? poll.expiresAt.toLocaleString('de-DE') : '';
+
+    return (0, jsx_runtime_1.jsxs)("div", {
+        className: "dht-poll",
+        children: [
+            (0, jsx_runtime_1.jsxs)("div", { className: "dht-poll-q", children: ['📊 ', poll.question?.text || 'Poll'] }),
+            (0, jsx_runtime_1.jsx)("div", {
+                className: "dht-poll-answers",
+                children: answers.map((a, i) => {
+                    const text = a.text ?? a.media?.text ?? `Option ${i + 1}`;
+                    const votes = a.voteCount || 0;
+                    const pct = totalVotes > 0 ? Math.round((votes / totalVotes) * 100) : 0;
+                    return (0, jsx_runtime_1.jsxs)("div", { className: "dht-poll-a", children: [
+                        (0, jsx_runtime_1.jsx)("div", { className: "dht-poll-bar", style: { width: pct + '%' } }),
+                        (0, jsx_runtime_1.jsxs)("div", { className: "dht-poll-line", children: [
+                            (0, jsx_runtime_1.jsx)("span", { children: String(text) }),
+                            (0, jsx_runtime_1.jsxs)("span", { className: "dht-poll-pct", children: [votes, ' (', pct, '%)'] })
+                        ] })
+                    ] }, i);
+                })
+            }),
+            (0, jsx_runtime_1.jsxs)("div", { className: "dht-poll-foot", children: [totalVotes, ' votes', expires ? ' · ends ' + expires : ''] })
+        ]
+    });
+}
+
+function renderVoiceIndicator(message, context) {
+    const audio = message.attachments?.find?.((a) => typeof a.contentType === 'string' && a.contentType.startsWith('audio/'));
+    const duration = audio?.duration_secs || audio?.durationSecs;
+    const waveformB64 = audio?.waveform;
+    let waveformSvg = null;
+    if (typeof waveformB64 === 'string' && waveformB64.length > 0) {
+        try {
+            const buf = Buffer.from(waveformB64, 'base64');
+            const bars = Array.from(buf).slice(0, 100);
+            const max = bars.length ? Math.max(1, ...bars) : 1;
+            const width = bars.length * 3;
+            const rects = bars.map((b, i) => {
+                const h = Math.max(2, (b / max) * 20);
+                return `<rect x="${i * 3}" y="${(22 - h) / 2}" width="2" height="${h}" rx="1" fill="#5865F2"/>`;
+            }).join('');
+            waveformSvg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${width} 22" width="${width}" height="22">${rects}</svg>`;
+        } catch (_e) {}
+    }
+    return (0, jsx_runtime_1.jsxs)("div", { className: "dht-voice", children: [
+        (0, jsx_runtime_1.jsx)("span", { className: "dht-voice-icon", children: '🎤' }),
+        (0, jsx_runtime_1.jsx)("span", { className: "dht-voice-label", "data-i18n": "voiceMessage", children: t(context, 'voiceMessage', 'Voice message') }),
+        waveformSvg && (0, jsx_runtime_1.jsx)("span", { className: "dht-voice-wave", dangerouslySetInnerHTML: { __html: waveformSvg } }),
+        duration ? (0, jsx_runtime_1.jsxs)("span", { className: "dht-voice-dur", children: [Math.round(duration), 's'] }) : null,
+    ] });
+}
+
+function renderSnapshots(snapshots, context) {
+    return (0, jsx_runtime_1.jsx)("div", {
+        className: "dht-forwarded-wrap",
+        children: snapshots.map((snap, i) => {
+            const m = snap.message || snap;
+            const author = m?.author?.displayName || m?.author?.username || 'Unknown';
+            const text = m?.content || '';
+            return (0, jsx_runtime_1.jsxs)("div", { className: "dht-forwarded", children: [
+                (0, jsx_runtime_1.jsxs)("div", { className: "dht-forwarded-head", children: [
+                    (0, jsx_runtime_1.jsx)("span", { className: "dht-forwarded-icon", children: '↪️' }),
+                    (0, jsx_runtime_1.jsx)("span", { "data-i18n": "forwardedFrom", children: t(context, 'forwardedFrom', 'Forwarded from') }),
+                    (0, jsx_runtime_1.jsx)("strong", { children: ' ' + author }),
+                ] }),
+                text && (0, jsx_runtime_1.jsx)("div", { className: "dht-forwarded-body", children: (0, jsx_runtime_1.jsx)(content_1.default, { content: text, context: Object.assign({}, context, { type: content_1.RenderType.REPLY }) }) }),
+                Array.isArray(m?.attachments) && m.attachments.length > 0 && (0, jsx_runtime_1.jsxs)("div", { className: "dht-forwarded-attachments", children: [m.attachments.length, ' attachment(s)'] }),
+            ] }, i);
+        })
+    });
+}
+
+function renderEditHistory(history, context) {
+    // Optional feature — host bot may attach `message.editHistory: [{content, editedAt}, …]`
+    return (0, jsx_runtime_1.jsxs)("details", { className: "dht-edit-history", children: [
+        (0, jsx_runtime_1.jsx)("summary", { "data-i18n": "editHistoryTitle", children: t(context, 'editHistoryTitle', 'Edit history') }),
+        (0, jsx_runtime_1.jsx)("ol", { children: history.map((entry, i) => {
+            const when = entry.editedAt instanceof Date ? entry.editedAt.toISOString() : (typeof entry.editedAt === 'string' ? entry.editedAt : '');
+            return (0, jsx_runtime_1.jsxs)("li", { children: [
+                when && (0, jsx_runtime_1.jsxs)("time", { dateTime: when, children: [t(context, 'editHistoryAt', 'at'), ' ', when] }),
+                (0, jsx_runtime_1.jsx)("div", { children: String(entry.content || '') })
+            ] }, i);
+        }) })
+    ] });
+}
+//# sourceMappingURL=message.js.map

package/dist/generator/renderers/reply.js

@@ -1,53 +1,61 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
+    var ownKeys = function(o){ownKeys = Object.getOwnPropertyNames || function (o){var ar=[];for (var k in o) if (Object.prototype.hasOwnProperty.call(o,k)) ar[ar.length]=k;return ar;};return ownKeys(o);};
+    return function (mod){if (mod && mod.__esModule) return mod;var result={};if (mod != null) for (var k=ownKeys(mod), i=0; i<k.length; i++) if (k[i] !== "default") Object.defineProperty(result,k[i],{get:function(){return mod[k[i]];}});Object.defineProperty(result,"default",{value:mod,enumerable:true});return result;};
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = MessageReply;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const discord_js_1 = require("discord.js");
 const content_1 = __importStar(require("./content"));
+
+function t(context, key, fallback) {
+    const dict = context?.i18n?.[context?.lang] || context?.i18n?.en || {};
+    return dict[key] || fallback || key;
+}
+
 async function MessageReply({ message, context }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    if (!message.reference)
-        return null;
-    if (message.reference.guildId !== ((_a = message.guild) === null || _a === void 0 ? void 0 : _a.id))
-        return null;
+    if (!message.reference) return null;
+
+    const isCrossGuild = message.reference.guildId !== message.guild?.id;
+
+    // Cross-guild reply: show a placeholder pill instead of silently dropping.
+    if (isCrossGuild) {
+        return (0, jsx_runtime_1.jsx)("discord-reply", {
+            slot: "reply",
+            server: true,
+            children: (0, jsx_runtime_1.jsx)("em", { "data-i18n": "crossServerReply", children: t(context, 'crossServerReply', 'Message from another server') })
+        });
+    }
+
     const referencedMessage = context.messages.find((m) => m.id === message.reference.messageId);
     if (!referencedMessage)
         return (0, jsx_runtime_1.jsx)("discord-reply", { slot: "reply", children: "Message could not be loaded." });
-    const isCrossPost = referencedMessage.reference && referencedMessage.reference.guildId !== ((_b = message.guild) === null || _b === void 0 ? void 0 : _b.id);
+
+    const isCrossPost = referencedMessage.reference && referencedMessage.reference.guildId !== message.guild?.id;
     const isCommand = referencedMessage.interaction !== null;
-    return ((0, jsx_runtime_1.jsx)("discord-reply", { slot: "reply", edited: !isCommand && referencedMessage.editedAt !== null, attachment: referencedMessage.attachments.size > 0, author: (_e = (_d = (_c = referencedMessage.member) === null || _c === void 0 ? void 0 : _c.nickname) !== null && _d !== void 0 ? _d : referencedMessage.author.displayName) !== null && _e !== void 0 ? _e : referencedMessage.author.username, avatar: (_f = referencedMessage.author.avatarURL({ size: 32 })) !== null && _f !== void 0 ? _f : undefined, roleColor: (_h = (_g = referencedMessage.member) === null || _g === void 0 ? void 0 : _g.displayHexColor) !== null && _h !== void 0 ? _h : undefined, bot: !isCrossPost && referencedMessage.author.bot, verified: (_j = referencedMessage.author.flags) === null || _j === void 0 ? void 0 : _j.has(discord_js_1.UserFlags.VerifiedBot), op: ((_l = (_k = message === null || message === void 0 ? void 0 : message.channel) === null || _k === void 0 ? void 0 : _k.isThread) === null || _l === void 0 ? void 0 : _l.call(_k)) && referencedMessage.author.id === ((_m = message === null || message === void 0 ? void 0 : message.channel) === null || _m === void 0 ? void 0 : _m.ownerId), server: isCrossPost !== null && isCrossPost !== void 0 ? isCrossPost : undefined, command: isCommand, children: referencedMessage.content ? ((0, jsx_runtime_1.jsx)("span", { "data-goto": referencedMessage.id, className: "reply-inline", children: (0, jsx_runtime_1.jsx)(content_1.default, { content: referencedMessage.content, context: Object.assign(Object.assign({}, context), { type: content_1.RenderType.REPLY }) }) })) : isCommand ? ((0, jsx_runtime_1.jsx)("em", { "data-goto": referencedMessage.id, children: "Click to see command." })) : ((0, jsx_runtime_1.jsx)("em", { "data-goto": referencedMessage.id, children: "Click to see attachment." })) }));
+    const author = referencedMessage.member?.nickname ?? referencedMessage.author.displayName ?? referencedMessage.author.username;
+    const avatar = referencedMessage.author.avatarURL?.({ size: 32 }) ?? undefined;
+    const roleColor = referencedMessage.member?.displayHexColor ?? undefined;
+    const op = referencedMessage.author.id === message?.channel?.ownerId && message?.channel?.isThread?.();
+
+    return ((0, jsx_runtime_1.jsx)("discord-reply", {
+        slot: "reply",
+        edited: !isCommand && referencedMessage.editedAt !== null,
+        attachment: referencedMessage.attachments.size > 0,
+        author: author,
+        avatar: avatar,
+        roleColor: roleColor,
+        bot: !isCrossPost && referencedMessage.author.bot,
+        verified: referencedMessage.author.flags?.has?.(discord_js_1.UserFlags.VerifiedBot),
+        op: op,
+        server: isCrossPost ?? undefined,
+        command: isCommand,
+        children: referencedMessage.content
+            ? (0, jsx_runtime_1.jsx)("span", { "data-goto": referencedMessage.id, className: "reply-inline", children: (0, jsx_runtime_1.jsx)(content_1.default, { content: referencedMessage.content, context: Object.assign({}, context, { type: content_1.RenderType.REPLY }) }) })
+            : isCommand
+                ? (0, jsx_runtime_1.jsx)("em", { "data-goto": referencedMessage.id, children: "Click to see command." })
+                : (0, jsx_runtime_1.jsx)("em", { "data-goto": referencedMessage.id, children: "Click to see attachment." })
+    }));
 }
-//# sourceMappingURL=reply.js.map
+//# sourceMappingURL=reply.js.map

package/dist/generator/renderers/systemMessage.js

@@ -6,60 +6,145 @@ exports.JoinMessage = JoinMessage;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const discord_js_1 = require("discord.js");
 const utils_1 = require("../../utils/utils");
-async function SystemMessage({ message }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+
+function t(context, key, fallback) {
+    const dict = context?.i18n?.[context?.lang] || context?.i18n?.en || {};
+    return dict[key] || fallback || key;
+}
+
+async function SystemMessage({ message, context }) {
+    const author = message.author;
+    const authorName = author?.displayName ?? author?.username ?? 'Unknown';
+    const color = message.member?.roles?.color?.hexColor;
+    const ctx = context || {};
+
     switch (message.type) {
         case discord_js_1.MessageType.RecipientAdd:
         case discord_js_1.MessageType.UserJoin:
-            return ((0, jsx_runtime_1.jsx)("discord-system-message", { id: `m-${message.id}`, type: "join", children: (0, jsx_runtime_1.jsx)(JoinMessage, { member: message.member, fallbackUser: message.author }) }, message.id));
+            return ((0, jsx_runtime_1.jsx)("discord-system-message", { id: `m-${message.id}`, type: "join", children: (0, jsx_runtime_1.jsx)(JoinMessage, { member: message.member, fallbackUser: author, seed: message.id, context: ctx }) }, message.id));
+
         case discord_js_1.MessageType.ChannelPinnedMessage:
-            return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "pin", children: [(0, jsx_runtime_1.jsx)(Highlight, { color: (_b = (_a = message.member) === null || _a === void 0 ? void 0 : _a.roles.color) === null || _b === void 0 ? void 0 : _b.hexColor, children: (_c = message.author.displayName) !== null && _c !== void 0 ? _c : message.author.username }), ' ', "pinned ", (0, jsx_runtime_1.jsx)("i", { "data-goto": (_d = message.reference) === null || _d === void 0 ? void 0 : _d.messageId, children: "a message" }), " to this channel.", message.reactions.cache.size > 0 && ((0, jsx_runtime_1.jsx)("discord-reactions", { slot: "reactions", children: message.reactions.cache.map((reaction, id) => ((0, jsx_runtime_1.jsx)("discord-reaction", { name: reaction.emoji.name, emoji: (0, utils_1.parseDiscordEmoji)(reaction.emoji), count: reaction.count }, `${message.id}r${id}`))) }))] }, message.id));
+            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.') }),
+                (0, jsx_runtime_1.jsx)("i", { "data-goto": message.reference?.messageId, children: " (jump)" }),
+            ] }, message.id));
+
         case discord_js_1.MessageType.GuildBoost:
         case discord_js_1.MessageType.GuildBoostTier1:
         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: (_f = (_e = message.member) === null || _e === void 0 ? void 0 : _e.roles.color) === null || _f === void 0 ? void 0 : _f.hexColor, children: (_g = message.author.displayName) !== null && _g !== void 0 ? _g : message.author.username }), ' ', "boosted the server!"] }, message.id));
+            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)("span", { "data-i18n": "boosted", children: t(ctx, 'boosted', 'boosted the server!') }),
+            ] }, message.id));
+
         case discord_js_1.MessageType.ThreadStarterMessage:
-            return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `ms-${message.id}`, type: "thread", children: [(0, jsx_runtime_1.jsx)(Highlight, { color: (_j = (_h = message.member) === null || _h === void 0 ? void 0 : _h.roles.color) === null || _j === void 0 ? void 0 : _j.hexColor, children: (_k = message.author.displayName) !== null && _k !== void 0 ? _k : message.author.username }), ' ', "started a thread: ", (0, jsx_runtime_1.jsx)("i", { "data-goto": (_l = message.reference) === null || _l === void 0 ? void 0 : _l.messageId, children: message.content })] }, message.id));
-        // TODO: implement support for these:
-        case discord_js_1.MessageType.Default:
-        case discord_js_1.MessageType.RecipientRemove:
-        case discord_js_1.MessageType.Call:
+        case discord_js_1.MessageType.ThreadCreated:
+            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)("span", { "data-i18n": "threadStarted", children: t(ctx, 'threadStarted', 'started a thread:') }),
+                ' ',
+                (0, jsx_runtime_1.jsx)("i", { "data-goto": message.reference?.messageId, children: message.content || 'New thread' }),
+            ] }, message.id));
+
         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)("span", { "data-i18n": "changedChannelName", children: t(ctx, 'changedChannelName', 'changed the channel name:') }),
+                ' ',
+                (0, jsx_runtime_1.jsx)("strong", { children: message.content }),
+            ] }, message.id));
+
         case discord_js_1.MessageType.ChannelIconChange:
-        case discord_js_1.MessageType.ChannelFollowAdd:
-        case discord_js_1.MessageType.GuildDiscoveryDisqualified:
-        case discord_js_1.MessageType.GuildDiscoveryRequalified:
-        case discord_js_1.MessageType.GuildDiscoveryGracePeriodInitialWarning:
-        case discord_js_1.MessageType.GuildDiscoveryGracePeriodFinalWarning:
-        case discord_js_1.MessageType.ThreadCreated:
-        case discord_js_1.MessageType.Reply:
+            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)("span", { "data-i18n": "changedChannelIcon", children: t(ctx, 'changedChannelIcon', 'changed the channel icon.') }),
+            ] }, message.id));
+
         case discord_js_1.MessageType.ChatInputCommand:
-        case discord_js_1.MessageType.GuildInviteReminder:
-        case discord_js_1.MessageType.ContextMenuCommand:
-        case discord_js_1.MessageType.AutoModerationAction:
-        case discord_js_1.MessageType.RoleSubscriptionPurchase:
-        case discord_js_1.MessageType.InteractionPremiumUpsell:
-        case discord_js_1.MessageType.StageStart:
-        case discord_js_1.MessageType.StageEnd:
-        case discord_js_1.MessageType.StageSpeaker:
-        case discord_js_1.MessageType.StageRaiseHand:
-        case discord_js_1.MessageType.StageTopic:
-        case discord_js_1.MessageType.GuildApplicationPremiumSubscription:
-        case discord_js_1.MessageType.GuildIncidentAlertModeEnabled:
-        case discord_js_1.MessageType.GuildIncidentAlertModeDisabled:
+        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)("span", { "data-i18n": "usedCommand", children: t(ctx, 'usedCommand', 'used') }),
+                ' ',
+                (0, jsx_runtime_1.jsx)("strong", { children: cmd }),
+            ] }, message.id));
+        }
+
+        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)("span", { "data-i18n": "startedCall", children: t(ctx, 'startedCall', 'started a call.') }),
+            ] }, message.id));
+
+        case discord_js_1.MessageType.ChannelFollowAdd:
+            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 }),
+                ' ',
+                t(ctx, 'addedFollow', 'added {target} to follow this channel.').replace('{target}', message.content || ''),
+            ] }, message.id));
+
+        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)("span", { "data-i18n": "left", children: t(ctx, 'left', 'left.') }),
+            ] }, message.id));
+
+        case discord_js_1.MessageType.AutoModerationAction: {
+            // Discord packs detail into the first embed: matched_keyword, blocked_content, channel_id, rule_name
+            const e = message.embeds?.[0];
+            const ruleName = e?.fields?.find?.((f) => /rule/i.test(f.name))?.value || e?.title || '';
+            const blocked = e?.description || '';
+            return ((0, jsx_runtime_1.jsxs)("discord-system-message", { id: `m-${message.id}`, type: "boost", children: [
+                (0, jsx_runtime_1.jsx)("span", { "data-i18n": "autoModBlocked", children: t(ctx, 'autoModBlocked', 'AutoMod blocked a message.') }),
+                ruleName && (0, jsx_runtime_1.jsxs)("span", { className: "dht-automod-rule", children: [' · ', (0, utils_1.escapeHtml)(ruleName)] }),
+                blocked && (0, jsx_runtime_1.jsx)("blockquote", { className: "dht-automod-content", children: blocked }),
+            ] }, message.id));
+        }
+
+        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 }),
+                ' ',
+                t(ctx, 'roleSubPurchased', 'subscribed to {role}!').replace('{role}', roleName),
+            ] }, message.id));
+        }
+
         case discord_js_1.MessageType.GuildIncidentReportRaid:
         case discord_js_1.MessageType.GuildIncidentReportFalseAlarm:
-        case discord_js_1.MessageType.PurchaseNotification:
+        case discord_js_1.MessageType.GuildIncidentAlertModeEnabled:
+        case discord_js_1.MessageType.GuildIncidentAlertModeDisabled:
+            return ((0, jsx_runtime_1.jsx)("discord-system-message", { id: `m-${message.id}`, type: "boost", children: (0, jsx_runtime_1.jsx)("span", { "data-i18n": "serverAlert", children: t(ctx, 'serverAlert', 'Server safety alert.') }) }, message.id));
+
         case discord_js_1.MessageType.PollResult:
+            return ((0, jsx_runtime_1.jsx)("discord-system-message", { id: `m-${message.id}`, type: "edit", children: (0, jsx_runtime_1.jsx)("span", { "data-i18n": "pollEnded", children: t(ctx, 'pollEnded', 'A poll ended.') }) }, message.id));
+
+        // These render through the normal pipeline
+        case discord_js_1.MessageType.Default:
+        case discord_js_1.MessageType.Reply:
             return undefined;
+
         default:
             return undefined;
     }
 }
+
 function Highlight({ children, color }) {
-    return (0, jsx_runtime_1.jsx)("i", { style: { color: color !== null && color !== void 0 ? color : 'white' }, children: children });
+    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 allJoinMessages = [
     '{user} just joined the server - glhf!',
     '{user} just joined. Everyone, look busy!',
@@ -92,24 +177,34 @@ const allJoinMessages = [
     "We've been expecting you {user}",
     "It's dangerous to go alone, take {user}!",
     "{user} has joined the server! It's super effective!",
-    'Cheers, love! {user} is here!',
     '{user} is here, as the prophecy foretold.',
     "{user} has arrived. Party's over.",
     'Ready player {user}',
     '{user} is here to kick butt and chew bubblegum. And {user} is all out of gum.',
     "Hello. Is it {user} you're looking for?",
 ];
-function JoinMessage({ member, fallbackUser }) {
-    const randomMessage = allJoinMessages[Math.floor(Math.random() * allJoinMessages.length)];
-    return randomMessage
+
+// Deterministic — seed off message.id so the message text stays stable across re-renders.
+function pickJoinMessage(seed) {
+    if (!seed) return allJoinMessages[0];
+    try {
+        // Hash snowflake → index. BigInt safe for snowflakes.
+        let n = 0;
+        for (let i = 0; i < seed.length; i++) n = (n * 31 + seed.charCodeAt(i)) >>> 0;
+        return allJoinMessages[n % allJoinMessages.length];
+    } catch (_e) {
+        return allJoinMessages[0];
+    }
+}
+
+function JoinMessage({ member, fallbackUser, seed, context }) {
+    const template = pickJoinMessage(seed);
+    return template
         .split('{user}')
-        .flatMap((item, i) => {
-        var _a, _b, _c;
-        return [
+        .flatMap((item, i) => [
             item,
-            (0, jsx_runtime_1.jsx)(Highlight, { color: (_a = member === null || member === void 0 ? void 0 : member.roles.color) === null || _a === void 0 ? void 0 : _a.hexColor, children: (_c = (_b = member === null || member === void 0 ? void 0 : member.nickname) !== null && _b !== void 0 ? _b : fallbackUser.displayName) !== null && _c !== void 0 ? _c : fallbackUser.username }, i),
-        ];
-    })
+            (0, jsx_runtime_1.jsx)(Highlight, { color: member?.roles?.color?.hexColor, children: member?.nickname ?? fallbackUser.displayName ?? fallbackUser.username }, i),
+        ])
         .slice(0, -1);
 }
-//# sourceMappingURL=systemMessage.js.map
+//# sourceMappingURL=systemMessage.js.map