Email for professionals and teams
Improve message display
Hieu Nguyen (Jack)be039d31e4c2
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsxindex 5cc3225..40fd44b 100644--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx@@ -8,9 +8,8 @@ import dayjs from "dayjs";import { MarkAsRead } from "@/components/mark-read";import { MessageActions } from "@/components/message-actions/message-actions";import { getMessageBackHref } from "@/components/message-actions/utils";-import { getEmailAddress, getEmailDisplayName } from "@/lib/email/address";import type { MessageDetailResponse } from "./types";-import { fetchMessageDetail } from "./utils";+import { fetchMessageDetail, getMessageBodyDisplay, getMessageHeaderParties } from "./utils";export default function MessageDetailPage() {const params = useParams<{ messageId: string }>();@@ -45,10 +44,8 @@ export default function MessageDetailPage() {}const { message, body } = data;- const fromName = message.fromContactName ?? getEmailDisplayName(message.fromAddr);- const fromAddress = getEmailAddress(message.fromAddr);- const toName = message.toContactName ?? getEmailDisplayName(message.toAddr);- const toAddress = getEmailAddress(message.toAddr);+ const { fromName, fromAddress, toName } = getMessageHeaderParties(message);+ const bodyDisplay = getMessageBodyDisplay(body?.textBody, body?.htmlBody, message.snippet);return (<div className="h-full overflow-auto">@@ -78,12 +75,11 @@ export default function MessageDetailPage() {<div className="mb-6 flex items-start justify-between border-b border-neutral-100 pb-5"><div>- <p className="text-sm font-semibold text-neutral-900">{fromName}</p>+ <p className="text-sm text-neutral-900">+ <b>{fromName}</b> <span className="text-neutral-500"><{fromAddress}></span>+ </p><p className="text-xs text-neutral-500">- {fromAddress}- <span className="mx-1">to</span>- {toName}- {toAddress !== toName && <span className="ml-1">({toAddress})</span>}+ to {toName}</p></div><p className="text-xs text-neutral-400">@@ -91,13 +87,26 @@ export default function MessageDetailPage() {</p></div><div className="prose max-w-none text-neutral-900">- {body?.htmlBody ? (- <div dangerouslySetInnerHTML={{ __html: body.htmlBody }} />+ {bodyDisplay.htmlBody ? (+ <div dangerouslySetInnerHTML={{ __html: bodyDisplay.htmlBody }} />) : (<pre className="whitespace-pre-wrap text-sm">- {body?.textBody ?? message.snippet}+ {bodyDisplay.latestContent}</pre>)}+ {bodyDisplay.quotedContent.map((quotedContent) => (+ <blockquote+ key={`${quotedContent.dateLine}-${quotedContent.content.slice(0, 24)}`}+ className="mt-6 border-l-2 border-neutral-300 pl-4 text-neutral-500"+ >+ <p className="mb-3 text-xs font-medium text-neutral-400">+ {quotedContent.dateLine}+ </p>+ <pre className="whitespace-pre-wrap text-sm font-sans">+ {quotedContent.content}+ </pre>+ </blockquote>+ ))}</div></article></div>diff --git a/src/app/(dashboard)/inbox/[messageId]/types.d.ts b/src/app/(dashboard)/inbox/[messageId]/types.d.tsindex 268288c..abfba67 100644--- a/src/app/(dashboard)/inbox/[messageId]/types.d.ts+++ b/src/app/(dashboard)/inbox/[messageId]/types.d.ts@@ -1,4 +1,5 @@import type { Message } from "@/hooks/types";+import type { ReplyContentParts } from "@/lib/email/reply-content-types";export type MessageDetailResponse = {message?: Message;@@ -8,3 +9,8 @@ export type MessageDetailResponse = {} | null;error?: string;};++export type MessageBodyDisplay = ReplyContentParts & {+ htmlBody: string | null;+ hasQuotedContent: boolean;+};diff --git a/src/app/(dashboard)/inbox/[messageId]/utils.ts b/src/app/(dashboard)/inbox/[messageId]/utils.tsindex 81a24a6..27a2831 100644--- a/src/app/(dashboard)/inbox/[messageId]/utils.ts+++ b/src/app/(dashboard)/inbox/[messageId]/utils.ts@@ -1,7 +1,34 @@import { authFetch } from "@/lib/auth/client";-import type { MessageDetailResponse } from "./types";+import { getEmailAddress } from "@/lib/email/address";+import { getDisplayNameForAddress } from "@/lib/contacts/utils";+import { htmlToReadableText, splitRepliedEmailContent } from "@/lib/email/reply-content-utils";+import type { Message } from "@/hooks/types";+import type { MessageBodyDisplay, MessageDetailResponse } from "./types";export async function fetchMessageDetail(messageId: string): Promise<MessageDetailResponse> {const response = await authFetch(`/api/messages/${messageId}`);return (await response.json()) as MessageDetailResponse;}++export function getMessageHeaderParties(message: Message) {+ return {+ fromName: getDisplayNameForAddress(message.fromAddr, message.fromContactName),+ fromAddress: getEmailAddress(message.fromAddr),+ toName: getDisplayNameForAddress(message.toAddr, message.toContactName),+ };+}++export function getMessageBodyDisplay(+ textBody: string | null | undefined,+ htmlBody: string | null | undefined,+ fallback: string | null | undefined,+): MessageBodyDisplay {+ const textSource = textBody ?? (htmlToReadableText(htmlBody) || fallback || "");+ const parts = splitRepliedEmailContent(textSource);++ return {+ ...parts,+ htmlBody: parts.quotedContent.length > 0 ? null : htmlBody ?? null,+ hasQuotedContent: parts.quotedContent.length > 0,+ };+}diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.tsindex c1eb33a..931b9d8 100644--- a/src/app/api/messages/route.ts+++ b/src/app/api/messages/route.ts@@ -6,6 +6,7 @@ import { getDb } from "@/db";import { messages } from "@/db/schema";import { getContactDisplayNameMap } from "@/lib/contacts/service";import { normalizeEmailAddress } from "@/lib/email/address";+import { getLatestEmailContent } from "@/lib/email/reply-content-utils";export async function GET(request: Request) {const env = getEnv();@@ -74,6 +75,7 @@ export async function GET(request: Request) {);const enrichedRows = rows.map((message) => ({...message,+ snippet: getLatestEmailContent(message.snippet),fromContactName: contactMap.get(normalizeEmailAddress(message.fromAddr)) ?? null,toContactName: contactMap.get(normalizeEmailAddress(message.toAddr)) ?? null,}));diff --git a/src/lib/contacts/utils.ts b/src/lib/contacts/utils.tsindex 44e7dda..a9be60a 100644--- a/src/lib/contacts/utils.ts+++ b/src/lib/contacts/utils.ts@@ -1,9 +1,15 @@-import { parseEmailAddressParts } from "@/lib/email/address";+import { getEmailDisplayName, normalizeEmailAddress, parseEmailAddressParts } from "@/lib/email/address";export function getContactId(userId: string, email: string): string {return `${userId}:${email.trim().toLowerCase()}`;}export function getContactNameFromAddress(address: string): string | null {- return parseEmailAddressParts(address).name;+ const name = parseEmailAddressParts(address).name?.trim();+ if (!name) return null;+ return name === normalizeEmailAddress(address) ? null : name;+}++export function getDisplayNameForAddress(address: string, contactName?: string | null): string {+ return contactName?.trim() || getEmailDisplayName(address);}diff --git a/src/lib/email/parse.ts b/src/lib/email/parse.tsindex e3e5f7a..da3a949 100644--- a/src/lib/email/parse.ts+++ b/src/lib/email/parse.ts@@ -1,5 +1,6 @@import PostalMime from "postal-mime";import { formatPostalAddress, formatPostalAddressList } from "@/lib/email/address";+import { getLatestEmailContent, htmlToReadableText } from "@/lib/email/reply-content-utils";export type ParsedEmail = {subject: string | null;@@ -23,6 +24,6 @@ export async function parseRawMime(raw: ArrayBuffer): Promise<ParsedEmail> {}export function buildSnippet(text: string | null, html: string | null, max = 200): string {- const source = text ?? html?.replace(/<[^>]+>/g, " ") ?? "";+ const source = getLatestEmailContent(text ?? htmlToReadableText(html));return source.replace(/\s+/g, " ").trim().slice(0, max);}diff --git a/src/lib/email/reply-content-types.d.ts b/src/lib/email/reply-content-types.d.tsnew file mode 100644index 0000000..bf9e6b5--- /dev/null+++ b/src/lib/email/reply-content-types.d.ts@@ -0,0 +1,9 @@+export type QuotedEmailContent = {+ dateLine: string;+ content: string;+};++export type ReplyContentParts = {+ latestContent: string;+ quotedContent: QuotedEmailContent[];+};diff --git a/src/lib/email/reply-content-utils.ts b/src/lib/email/reply-content-utils.tsnew file mode 100644index 0000000..63a048d--- /dev/null+++ b/src/lib/email/reply-content-utils.ts@@ -0,0 +1,138 @@+import type { ReplyContentParts, QuotedEmailContent } from "./reply-content-types";++const ORIGINAL_MESSAGE_RE = /^-{2,}\s*Original Message\s*-{2,}$/i;+const UNDERSCORE_SEPARATOR_RE = /^_{8,}$/;+const WROTE_RE = /^On\s+(.+?)\s+wrote:\s*$/i;+const HEADER_RE = /^(From|To|Cc|Subject|Date|Sent):\s*(.*)$/i;++export function splitRepliedEmailContent(content: string | null | undefined): ReplyContentParts {+ const lines = normalizeContent(content).split("\n");+ const originalMessageIndex = lines.findIndex((line) => ORIGINAL_MESSAGE_RE.test(line.trim()));+ if (originalMessageIndex >= 0) {+ return splitOriginalMessage(lines, originalMessageIndex);+ }++ const underscoreSeparatorIndex = lines.findIndex((line) => UNDERSCORE_SEPARATOR_RE.test(line.trim()));+ if (underscoreSeparatorIndex >= 0) {+ return splitSeparatorQuotedContent(lines, underscoreSeparatorIndex);+ }++ const wroteIndex = lines.findIndex((line) => WROTE_RE.test(line.trim()));+ if (wroteIndex >= 0) {+ const markerLine = lines[wroteIndex]?.trim() ?? "";+ return {+ latestContent: trimEmptyLines(lines.slice(0, wroteIndex)).join("\n").trim(),+ quotedContent: [+ {+ dateLine: getWroteDateLine(markerLine),+ content: stripQuotePrefixes(lines.slice(wroteIndex + 1)).join("\n").trim(),+ },+ ].filter(hasQuotedContent),+ };+ }++ const quoteIndex = lines.findIndex((line) => line.trim().startsWith(">"));+ if (quoteIndex >= 0) {+ return {+ latestContent: trimEmptyLines(lines.slice(0, quoteIndex)).join("\n").trim(),+ quotedContent: [+ {+ dateLine: "Previous message",+ content: stripQuotePrefixes(lines.slice(quoteIndex)).join("\n").trim(),+ },+ ].filter(hasQuotedContent),+ };+ }++ return { latestContent: normalizeContent(content).trim(), quotedContent: [] };+}++export function getLatestEmailContent(content: string | null | undefined): string {+ return splitRepliedEmailContent(content).latestContent;+}++export function htmlToReadableText(html: string | null | undefined): string {+ return (html ?? "")+ .replace(/<br\s*\/?>/gi, "\n")+ .replace(/<\/(p|div|li|tr|blockquote|h[1-6])>/gi, "\n")+ .replace(/<[^>]+>/g, " ")+ .replace(/ /g, " ")+ .replace(/&/g, "&")+ .replace(/</g, "<")+ .replace(/>/g, ">")+ .replace(/"/g, "\"")+ .replace(/'/g, "'");+}++function splitOriginalMessage(lines: string[], markerIndex: number): ReplyContentParts {+ const latestContent = trimEmptyLines(lines.slice(0, markerIndex)).join("\n").trim();+ const quotedLines = lines.slice(markerIndex + 1);+ const headers = new Map<string, string>();+ let contentStartIndex = 0;++ for (let index = 0; index < quotedLines.length; index += 1) {+ const line = quotedLines[index] ?? "";+ if (!line.trim()) {+ contentStartIndex = index + 1;+ break;+ }++ const match = line.match(HEADER_RE);+ if (match) {+ headers.set(match[1].toLowerCase(), match[2].trim());+ contentStartIndex = index + 1;+ }+ }++ const quotedContent: QuotedEmailContent[] = [+ {+ dateLine: headers.get("date") ?? headers.get("sent") ?? "Previous message",+ content: stripQuotePrefixes(quotedLines.slice(contentStartIndex)).join("\n").trim(),+ },+ ].filter(hasQuotedContent);++ return { latestContent, quotedContent };+}++function splitSeparatorQuotedContent(lines: string[], separatorIndex: number): ReplyContentParts {+ return {+ latestContent: trimEmptyLines(lines.slice(0, separatorIndex)).join("\n").trim(),+ quotedContent: [+ {+ dateLine: "Previous message",+ content: trimEmptyLines(lines.slice(separatorIndex + 1)).join("\n").trim(),+ },+ ].filter(hasQuotedContent),+ };+}++function getWroteDateLine(line: string): string {+ const match = line.match(WROTE_RE);+ const rawDateLine = match?.[1]?.trim() ?? "";+ return rawDateLine+ .replace(/,\s*["']?[^,<"]+["']?\s*<[^>]+>\s*$/i, "")+ .replace(/\b([0-9]{1,2}:[0-9]{2}\s?(?:AM|PM))(?:,?\s+.*)?$/i, "$1")+ .trim() || "Previous message";+}++function normalizeContent(content: string | null | undefined): string {+ return (content ?? "").replace(/\r\n?/g, "\n");+}++function stripQuotePrefixes(lines: string[]): string[] {+ return trimEmptyLines(lines.map((line) => line.replace(/^\s*>+\s?/, "")));+}++function trimEmptyLines(lines: string[]): string[] {+ let start = 0;+ let end = lines.length;++ while (start < end && !lines[start]?.trim()) start += 1;+ while (end > start && !lines[end - 1]?.trim()) end -= 1;++ return lines.slice(start, end);+}++function hasQuotedContent(quotedContent: QuotedEmailContent): boolean {+ return quotedContent.content.trim().length > 0;+}