diff --git a/src/components/DiscordLogs.jsx b/src/components/DiscordLogs.jsx
index 5b489bd..39c286d 100644
--- a/src/components/DiscordLogs.jsx
+++ b/src/components/DiscordLogs.jsx
@@ -104,7 +104,7 @@ function formatTimestamp(timestamp, format = 'full') {
const isToday = date.toDateString() === now.toDateString();
const isYesterday = new Date(now - 86400000).toDateString() === date.toDateString();
- const time = date.toLocaleTimeString('en-US', {
+ const time = date.toLocaleTimeString(undefined, {
hour: 'numeric',
minute: '2-digit',
hour12: true
@@ -115,7 +115,7 @@ function formatTimestamp(timestamp, format = 'full') {
if (isToday) return `Today at ${time}`;
if (isYesterday) return `Yesterday at ${time}`;
- return date.toLocaleDateString('en-US', {
+ return date.toLocaleDateString(undefined, {
month: 'short',
day: 'numeric',
year: date.getFullYear() !== now.getFullYear() ? 'numeric' : undefined
@@ -127,7 +127,7 @@ function formatTimestamp(timestamp, format = 'full') {
*/
function formatDateDivider(timestamp) {
const date = new Date(timestamp);
- return date.toLocaleDateString('en-US', {
+ return date.toLocaleDateString(undefined, {
weekday: 'long',
month: 'long',
day: 'numeric',
@@ -135,6 +135,29 @@ function formatDateDivider(timestamp) {
});
}
+/**
+ * Decode HTML entities safely. Uses the DOM if available (client-side), otherwise
+ * falls back to a robust regex for SSR environments.
+ */
+function decodeHtmlEntities(str) {
+ if (!str) return str;
+ try {
+ if (typeof document !== 'undefined') {
+ const tx = document.createElement('textarea');
+ tx.innerHTML = str;
+ return tx.value;
+ }
+ } catch (e) {
+ // fall through to fallback
+ }
+
+ return str.replace(/&(#(?:x[0-9a-fA-F]+|\d+)|[a-zA-Z]+);/g, (m, e) => {
+ if (e[0] === '#') return e[1] === 'x' ? String.fromCharCode(parseInt(e.slice(2), 16)) : String.fromCharCode(parseInt(e.slice(1), 10));
+ const map = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: ' ', ndash: '–', mdash: '—', rsquo: '’', lsquo: '‘', hellip: '…', rdquo: '”', ldquo: '“' };
+ return map[e] || m;
+ });
+}
+
/**
* Parse archived messages from #dds-archive channel
* These messages were re-sent by a bot with this format:
@@ -389,28 +412,41 @@ function resolveArchivedUser(archivedUsername, usersMap, members) {
* @param {Object} options - Options for parsing
* @param {Map} options.channelMap - Map of channel IDs to channel objects
* @param {Object} options.usersMap - Map of user IDs to user objects { displayName, username, color }
+ * @param {Object} options.rolesMap - Map of role IDs to role objects { name, color }
* @param {Function} options.onChannelClick - Callback when channel is clicked
*/
function parseDiscordMarkdown(text, options = {}) {
if (!text) return '';
- const { channelMap = new Map(), usersMap = {}, onChannelClick } = options;
+ // Normalize HTML entities that sometimes make it into messages/embed fields
+ // We decode before we escape so strings like "A & B" become "A & B"
+ // and avoid double-encoding when we later run an escape pass.
+
+ const { channelMap = new Map(), usersMap = {}, rolesMap = new Map(), onChannelClick } = options;
+
+ // Normalize entities then escape HTML to avoid XSS while ensuring
+ // already-encoded entities don't become double-encoded in the UI.
+ const normalized = decodeHtmlEntities(text);
// Escape HTML first
- let parsed = text
+ let parsed = normalized
.replace(/&/g, '&')
.replace(//g, '>');
// Code blocks (``` ```) - add data-lenis-prevent for independent scrolling
// Must be processed first to prevent other formatting inside code
+ // Don't trim - preserve whitespace for ASCII art
parsed = parsed.replace(/```(\w+)?\n?([\s\S]*?)```/g, (_, lang, code) => {
- return `
${code.trim()}
`;
+ // Only trim trailing newline, preserve all other whitespace
+ const trimmedCode = code.replace(/\n$/, '');
+ return `
${trimmedCode}
`;
});
// Inline code (`) - must be early to prevent formatting inside code
parsed = parsed.replace(/`([^`]+)`/g, '
$1');
+
// Blockquotes (> at start of line) - process before newline conversion
// Group consecutive > lines into a single blockquote
parsed = parsed.replace(/(^|\n)((?:> .+(?:\n|$))+)/gm, (_, before, block) => {
@@ -558,7 +594,13 @@ function parseDiscordMarkdown(text, options = {}) {
});
// Role mentions (<@&123456789>)
- parsed = parsed.replace(/<@&(\d+)>/g, '
@role');
+ parsed = parsed.replace(/<@&(\d+)>/g, (_, roleId) => {
+ const role = rolesMap?.get?.(roleId) || rolesMap?.[roleId];
+ const roleName = role?.name || 'role';
+ const roleColor = role?.color || null;
+ const style = roleColor ? ` style="color: ${roleColor}; background-color: ${roleColor}20;"` : '';
+ return `
@${roleName}`;
+ });
// Slash command mentions ()
parsed = parsed.replace(/<\/([^:]+):(\d+)>/g, '
/$1');
@@ -709,14 +751,14 @@ const LinkPreview = memo(function LinkPreview({ url, cachedPreview, onPreviewLoa
YouTube
{preview.title && (
- {preview.title}
+ {decodeHtmlEntities(preview.title)}
)}