Email for professionals and teams
add email original view
Hieu Nguyen (Jack)be6459da5e7e
diff --git a/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts b/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.tsindex 557e526..ff390fe 100644--- a/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts+++ b/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts@@ -208,6 +208,17 @@ function sanitizeElement(element: Element): void {export function sanitizeEmailHtml(html: string | null): string | null {if (!html) return null;const document = new DOMParser().parseFromString(html, "text/html");+ for (const blockquote of Array.from(document.body.querySelectorAll("blockquote"))) {+ const introduction = blockquote.previousElementSibling;+ if (+ introduction instanceof HTMLElement &&+ /^On\b[\s\S]*\bwrote:\s*$/i.test(introduction.textContent?.trim() ?? "") &&+ !introduction.style.marginTop+ ) {+ introduction.style.marginTop = "1.4em";+ introduction.style.paddingBottom = "0.6em";+ }+ }for (const element of Array.from(document.body.querySelectorAll("*"))) {sanitizeElement(element);}diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsxindex cd404ee..7d21205 100644--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx@@ -3,7 +3,7 @@import Link from "next/link";import { useParams } from "next/navigation";import { useEffect, useState } from "react";-import { ArrowLeft, ChevronRight, Cloud, ExternalLink } from "lucide-react";+import { ArrowLeft, Cloud, ExternalLink } from "lucide-react";import dayjs from "dayjs";import { MarkAsRead } from "@/components/mark-read";import { useSelectedMailbox } from "@/components/mailbox-provider";@@ -16,6 +16,7 @@ import { MessageDetailSkeleton } from "@/components/page-skeletons";import { usePageLoading } from "@/components/page-loading";import { PreviousMessage } from "@/components/previous-message";import { ConversationThread } from "@/components/messages/conversation-thread";+import { QuotedEmailToggle } from "@/components/messages/quoted-email-toggle";import { ThreadMessageActions } from "@/components/messages/thread-message-actions";import { SpamScoreDetails } from "@/components/messages/spam-score-details";import { useMessageThread } from "@/components/messages/use-message-thread";@@ -34,6 +35,7 @@ import {} from "./utils";import { extractCloudAttachments } from "./cloud-attachment-utils";import { sanitizeEmailHtml } from "./email-html-sanitizer";+import { collapseQuotedEmailHtml } from "./quote-collapse-utils";export default function MessageDetailPage() {const params = useParams<{ messageId: string }>();@@ -125,19 +127,19 @@ export default function MessageDetailPage() {message.snippet,ownAddress,);- const htmlBody = sanitizeEmailHtml(+ const htmlBody = collapseQuotedEmailHtml(sanitizeEmailHtml(resolveInlineAttachmentUrls(bodyDisplay.htmlBody, message.id, attachments),- );- const quotedHtml = sanitizeEmailHtml(+ ));+ const quotedHtml = collapseQuotedEmailHtml(sanitizeEmailHtml(resolveInlineAttachmentUrls(bodyDisplay.quotedHtml, message.id, attachments),- );+ ), true);const cloudAttachmentResult = extractCloudAttachments(bodyDisplay.latestContent,);return (<div className="h-full overflow-y-auto overscroll-contain scrollbar-gutter-stable">{!message.read && <MarkAsRead messageId={message.id} />}- <div className="flex pt-3 pb-2.75 items-center justify-between px-2 border-b border-neutral-200 sticky top-0 bg-white">+ <div className="flex pt-3 pb-2.75 items-center justify-between px-2 border-b border-neutral-200 sticky top-0 bg-white z-40"><div className="flex-1" />{/* <div className="flex items-center flex-row gap-6"><Link@@ -258,18 +260,7 @@ export default function MessageDetailPage() {{cloudAttachmentResult.content}</pre>)}- {quotedHtml && (- <details className="group mt-4 border-l-2 border-neutral-200 pl-4">- <summary className="flex cursor-pointer list-none items-center gap-2 rounded-md py-2 text-xs font-medium text-neutral-500 hover:text-neutral-800">- <ChevronRight className="h-3.5 w-3.5 shrink-0 transition-transform group-open:rotate-90" />- <span>Quoted text</span>- </summary>- <div- className="email-body max-w-none pb-2 text-sm text-neutral-600"- dangerouslySetInnerHTML={{ __html: quotedHtml }}- />- </details>- )}+ {quotedHtml && <QuotedEmailToggle html={quotedHtml} />}{bodyDisplay.quotedContent.map((quotedContent) => (<PreviousMessagekey={`${quotedContent.dateLine}-${quotedContent.content.slice(0, 24)}`}diff --git a/src/app/(dashboard)/inbox/[messageId]/quote-collapse-utils.ts b/src/app/(dashboard)/inbox/[messageId]/quote-collapse-utils.tsnew file mode 100644index 0000000..83d224a--- /dev/null+++ b/src/app/(dashboard)/inbox/[messageId]/quote-collapse-utils.ts@@ -0,0 +1,30 @@+export function collapseQuotedEmailHtml(html: string | null, preserveLeadingQuote = false): string | null {+ if (!html) return null;+ const document = new DOMParser().parseFromString(html, "text/html");++ for (const blockquote of Array.from(document.body.querySelectorAll("blockquote"))) {+ const introduction = blockquote.previousElementSibling;+ if (+ !(introduction instanceof HTMLElement) ||+ !/^On\b[\s\S]*\bwrote:\s*$/i.test(introduction.textContent?.trim() ?? "")+ ) continue;+ if (+ preserveLeadingQuote &&+ introduction === document.body.firstElementChild &&+ blockquote === introduction.nextElementSibling+ ) continue;++ const details = document.createElement("details");+ details.className = "email-quote-toggle";+ const summary = document.createElement("summary");+ summary.setAttribute("aria-label", "Toggle quoted email");+ summary.setAttribute("title", "Show or hide quoted email");+ const content = document.createElement("div");+ content.className = "email-quote-content";+ introduction.parentNode?.insertBefore(details, introduction);+ content.append(introduction, blockquote);+ details.append(summary, content);+ }++ return document.body.innerHTML;+}diff --git a/src/app/api/messages/[messageId]/original/route.ts b/src/app/api/messages/[messageId]/original/route.tsnew file mode 100644index 0000000..9da3aab--- /dev/null+++ b/src/app/api/messages/[messageId]/original/route.ts@@ -0,0 +1,37 @@+import { eq } from "drizzle-orm";+import { getDb } from "@/db";+import { messages } from "@/db/schema";+import { getCurrentUser } from "@/lib/auth/cookies";+import { getEnv } from "@/lib/cloudflare";+import { getMailboxAccessLevel } from "@/lib/mailboxes/access";+import type { MessageOriginalRouteParams } from "./types";++export async function GET(request: Request, { params }: MessageOriginalRouteParams) {+ const env = getEnv();+ const user = await getCurrentUser(env, request);+ if (!user) return new Response("Unauthorized", { status: 401 });++ const { messageId } = await params;+ const db = getDb(env);+ const [message] = await db+ .select({ mailboxId: messages.mailboxId, rawR2Key: messages.rawR2Key })+ .from(messages)+ .where(eq(messages.id, messageId))+ .limit(1);+ if (!message?.mailboxId) return new Response("Message not found", { status: 404 });+ const access = await getMailboxAccessLevel(db, user, message.mailboxId);+ if (!access?.canRead) return new Response("Message not found", { status: 404 });+ if (!message.rawR2Key) {+ return new Response("Original source was not retained for this message.", { status: 404 });+ }++ const object = await env.BUCKET.get(message.rawR2Key);+ if (!object) return new Response("Original source is unavailable.", { status: 404 });+ return new Response(object.body, {+ headers: {+ "Content-Type": "text/plain; charset=utf-8",+ "Cache-Control": "private, no-store",+ "X-Content-Type-Options": "nosniff",+ },+ });+}diff --git a/src/app/api/messages/[messageId]/original/types.d.ts b/src/app/api/messages/[messageId]/original/types.d.tsnew file mode 100644index 0000000..db15dd6--- /dev/null+++ b/src/app/api/messages/[messageId]/original/types.d.ts@@ -0,0 +1,3 @@+export type MessageOriginalRouteParams = {+ params: Promise<{ messageId: string }>;+};diff --git a/src/app/globals.css b/src/app/globals.cssindex 5eae65a..440647c 100644--- a/src/app/globals.css+++ b/src/app/globals.css@@ -132,3 +132,41 @@ pre {.email-body p {margin: 0 0 0.5rem;}+.email-quote-toggle {+ margin-top: 1.4em;+}+.email-quote-toggle > summary {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 26px;+ height: 12px;+ border-radius: 9999px;+ background: #ececec;+ color: #4d4d4d;+ cursor: pointer;+ list-style: none;+}+.email-quote-toggle > summary::-webkit-details-marker {+ display: none;+}+.email-quote-toggle > summary::marker {+ content: "";+}+.email-quote-toggle > summary::before {+ content: "•••";+ font-size: 11px;+ font-weight: 700;+ letter-spacing: 0.04em;+ transform: translateY(-0.5px);+}+.email-quote-toggle > summary:hover {+ background: #e5e5e5;+}+.email-quote-toggle > summary:focus-visible {+ outline: 2px solid #2563eb;+ outline-offset: 2px;+}+.email-quote-content {+ display: flow-root;+}diff --git a/src/components/message-actions/message-actions.tsx b/src/components/message-actions/message-actions.tsxindex 27a07b9..3426e6f 100644--- a/src/components/message-actions/message-actions.tsx+++ b/src/components/message-actions/message-actions.tsx@@ -2,8 +2,9 @@import { createElement, useState, useMemo, useCallback } from "react";import { useRouter } from "next/navigation";-import { Archive, Ban, BellOff, Forward, Mail, MailOpen, MoreVertical, Reply, ReplyAll, ShieldAlert, Trash2 } from "lucide-react";+import { Archive, Ban, BellOff, FileCode2, Forward, Mail, MailOpen, MoreVertical, Reply, ReplyAll, ShieldAlert, Trash2 } from "lucide-react";import { useCompose } from "@/components/compose/compose-context";+import { MessageSourceDialog } from "@/components/messages/message-source-dialog";import { useHotkeys, useShortcuts } from "@/components/shortcuts";import { Button } from "@/components/ui/button";import { Tooltip } from "@/components/ui/tooltip";@@ -48,6 +49,7 @@ export function MessageActions({>(null);const [error, setError] = useState<string | null>(null);const [moreOpen, setMoreOpen] = useState(false);+ const [sourceOpen, setSourceOpen] = useState(false);const runAction = useCallback(async (action: BulkMessageAction) => {setMoreOpen(false);@@ -346,6 +348,15 @@ export function MessageActions({<hr className="my-1 border-neutral-100" /></>)}+ <button+ type="button"+ className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm text-neutral-700 hover:bg-neutral-100"+ onClick={() => { setMoreOpen(false); setSourceOpen(true); }}+ >+ <FileCode2 className="h-4 w-4" />+ Show original+ </button>+ <hr className="my-1 border-neutral-100" /><p className="mt-1 px-3 pb-1 pt-2 text-sm font-medium text-neutral-500">Move to</p>@@ -364,6 +375,7 @@ export function MessageActions({)}</div></div>+ <MessageSourceDialog messageId={messageId} open={sourceOpen} onOpenChange={setSourceOpen} /></div>);}diff --git a/src/components/message-actions/utils.ts b/src/components/message-actions/utils.tsindex 9515391..513d615 100644--- a/src/components/message-actions/utils.ts+++ b/src/components/message-actions/utils.ts@@ -147,7 +147,7 @@ export function buildReplyQuote(return `\n\n${getEmailAddress(senderAddress)} wrote:\n${quoted}\n`;}-const QUOTE_STYLE = "margin:0 0 0 .8ex;border-left:1px solid #ccc;padding-left:1ex";+const QUOTE_STYLE = "margin:0 0 0 0;border-left:1px solid #ccc;padding-left:1ex;opacity:0.6";/*** The folded quote under a reply: the "On <date>, <sender> wrote:" line every@@ -163,7 +163,7 @@ export function buildReplyQuoteHtml(if (!original) return null;const when = sentAt ? dayjs(sentAt).format("ddd, MMM D, YYYY [at] h:mm A") : "an earlier date";return wrapQuotedHtml(- `<div>On ${escapeHtml(when)}, ${escapeHtml(senderAddress)} wrote:</div><blockquote style="${QUOTE_STYLE}">${original}</blockquote>`,+ `<div style="margin-top:1.4em">On ${escapeHtml(when)}, ${escapeHtml(senderAddress)} wrote:</div><blockquote style="${QUOTE_STYLE}">${original}</blockquote>`,);}diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsxindex f102503..c8d8a1e 100644--- a/src/components/messages/conversation-thread.tsx+++ b/src/components/messages/conversation-thread.tsx@@ -4,8 +4,10 @@ import { useEffect, useState } from "react";import dayjs from "dayjs";import { ChevronsUpDown, Paperclip } from "lucide-react";import { ContactAvatar } from "@/components/contacts/contact-avatar";+import { QuotedEmailToggle } from "@/components/messages/quoted-email-toggle";import { runSingleMessageAction } from "@/components/message-actions/utils";import { sanitizeEmailHtml } from "@/app/(dashboard)/inbox/[messageId]/email-html-sanitizer";+import { collapseQuotedEmailHtml } from "@/app/(dashboard)/inbox/[messageId]/quote-collapse-utils";import { getMessageBodyDisplay, resolveInlineAttachmentUrls } from "@/app/(dashboard)/inbox/[messageId]/utils";import { cn } from "@/lib/utils";@@ -122,12 +124,13 @@ export function ConversationMessageCard({useEffect(() => setLocallyRead(message.read), [message.read]);- let body: { html: string | null; text: string } | null = null;+ let body: { html: string | null; text: string; quotedHtml: string | null } | null = null;if (expanded) {const display = getMessageBodyDisplay(message.textBody, message.htmlBody, message.snippet);body = {- html: sanitizeEmailHtml(resolveInlineAttachmentUrls(display.htmlBody, message.id, message.attachments)),+ html: collapseQuotedEmailHtml(sanitizeEmailHtml(resolveInlineAttachmentUrls(display.htmlBody, message.id, message.attachments))),text: display.latestContent,+ quotedHtml: collapseQuotedEmailHtml(sanitizeEmailHtml(resolveInlineAttachmentUrls(display.quotedHtml, message.id, message.attachments)), true),};}@@ -184,6 +187,7 @@ export function ConversationMessageCard({) : (<pre className="whitespace-pre-wrap font-sans text-sm text-neutral-900">{body.text}</pre>)}+ {body.quotedHtml && <QuotedEmailToggle html={body.quotedHtml} />}{attachments.length > 0 && (<ul className="mt-4 flex flex-wrap gap-2">{attachments.map((attachment) => (diff --git a/src/components/messages/message-source-dialog-types.d.ts b/src/components/messages/message-source-dialog-types.d.tsnew file mode 100644index 0000000..04e9bcb--- /dev/null+++ b/src/components/messages/message-source-dialog-types.d.ts@@ -0,0 +1,5 @@+export type MessageSourceDialogProps = {+ messageId: string;+ open: boolean;+ onOpenChange: (open: boolean) => void;+};diff --git a/src/components/messages/message-source-dialog.tsx b/src/components/messages/message-source-dialog.tsxnew file mode 100644index 0000000..d7cacbb--- /dev/null+++ b/src/components/messages/message-source-dialog.tsx@@ -0,0 +1,48 @@+"use client";++import { useEffect, useState } from "react";+import { LoaderCircle } from "lucide-react";+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";+import type { MessageSourceDialogProps } from "./message-source-dialog-types";+import { fetchMessageSource } from "./message-source-utils";++export function MessageSourceDialog({ messageId, open, onOpenChange }: MessageSourceDialogProps) {+ const [source, setSource] = useState<string | null>(null);+ const [error, setError] = useState<string | null>(null);+ const [loading, setLoading] = useState(false);++ useEffect(() => {+ if (!open) return;+ const controller = new AbortController();+ setSource(null);+ setError(null);+ setLoading(true);+ fetchMessageSource(messageId, controller.signal)+ .then((value) => {+ if (!controller.signal.aborted) setSource(value);+ })+ .catch((reason) => {+ if (!controller.signal.aborted) setError(reason instanceof Error ? reason.message : "Unable to load original message");+ })+ .finally(() => {+ if (!controller.signal.aborted) setLoading(false);+ });+ return () => controller.abort();+ }, [messageId, open]);++ return (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent className="flex max-h-[90vh] w-[min(960px,calc(100vw-32px))] flex-col">+ <DialogHeader>+ <DialogTitle>Show original</DialogTitle>+ <DialogDescription>Full message source, including headers and MIME body.</DialogDescription>+ </DialogHeader>+ {loading && <div className="flex items-center gap-2 text-sm text-neutral-500"><LoaderCircle className="h-4 w-4 animate-spin" />Loading source…</div>}+ {error && <p className="text-sm text-neutral-600">{error}</p>}+ {source !== null && (+ <pre className="min-h-0 overflow-auto rounded-lg border border-neutral-200 bg-neutral-50 p-4 font-mono text-xs leading-relaxed text-neutral-900 whitespace-pre">{source}</pre>+ )}+ </DialogContent>+ </Dialog>+ );+}diff --git a/src/components/messages/message-source-utils.ts b/src/components/messages/message-source-utils.tsnew file mode 100644index 0000000..263e661--- /dev/null+++ b/src/components/messages/message-source-utils.ts@@ -0,0 +1,11 @@+import { authFetch } from "@/lib/auth/client";++export async function fetchMessageSource(messageId: string, signal: AbortSignal): Promise<string> {+ const response = await authFetch(`/api/messages/${encodeURIComponent(messageId)}/original`, {+ signal,+ redirectOnUnauthorized: false,+ });+ const source = await response.text();+ if (!response.ok) throw new Error(source || "Unable to load original message");+ return source;+}diff --git a/src/components/messages/message-split-layout.tsx b/src/components/messages/message-split-layout.tsxindex fa3c819..f505892 100644--- a/src/components/messages/message-split-layout.tsx+++ b/src/components/messages/message-split-layout.tsx@@ -20,7 +20,7 @@ export function MessageSplitLayout({if (!selectedMessageId) return children;return (- <div className="h-full min-h-0 overflow-hidden lg:grid lg:grid-cols-[minmax(300px,380px)_minmax(0,1fr)]">+ <div className="h-full min-h-0 overflow-hidden lg:grid lg:grid-cols-[minmax(300px,360px)_minmax(0,1fr)]"><aside className="hidden min-h-0 overflow-hidden border-r border-neutral-200 bg-white lg:block"><MessageFolderPageconfig={config}diff --git a/src/components/messages/quoted-email-toggle-types.d.ts b/src/components/messages/quoted-email-toggle-types.d.tsnew file mode 100644index 0000000..284e957--- /dev/null+++ b/src/components/messages/quoted-email-toggle-types.d.ts@@ -0,0 +1,3 @@+export type QuotedEmailToggleProps = {+ html: string;+};diff --git a/src/components/messages/quoted-email-toggle.tsx b/src/components/messages/quoted-email-toggle.tsxnew file mode 100644index 0000000..1ad5c18--- /dev/null+++ b/src/components/messages/quoted-email-toggle.tsx@@ -0,0 +1,13 @@+import type { QuotedEmailToggleProps } from "./quoted-email-toggle-types";++export function QuotedEmailToggle({ html }: QuotedEmailToggleProps) {+ return (+ <details className="email-quote-toggle">+ <summary aria-label="Toggle quoted email" title="Show or hide quoted email" />+ <div+ className="email-body email-quote-content max-w-none text-sm text-neutral-600"+ dangerouslySetInnerHTML={{ __html: html }}+ />+ </details>+ );+}diff --git a/src/components/messages/thread-message-actions.tsx b/src/components/messages/thread-message-actions.tsxindex fbfb2f3..e4367f8 100644--- a/src/components/messages/thread-message-actions.tsx+++ b/src/components/messages/thread-message-actions.tsx@@ -1,8 +1,9 @@"use client";import { createElement, useEffect, useState } from "react";-import { Ban, Forward, Mail, MailOpen, MoreVertical, Reply, ReplyAll, Star } from "lucide-react";+import { Ban, FileCode2, Forward, Mail, MailOpen, MoreVertical, Reply, ReplyAll, Star } from "lucide-react";import { useCompose } from "@/components/compose/compose-context";+import { MessageSourceDialog } from "@/components/messages/message-source-dialog";import { getOwnAddressForMessage } from "@/app/(dashboard)/inbox/[messageId]/utils";import { Button } from "@/components/ui/button";import { Tooltip } from "@/components/ui/tooltip";@@ -29,6 +30,7 @@ export function ThreadMessageActions({const { openDraftComposer } = useCompose();const [starred, setStarred] = useState(message.starred);const [moreOpen, setMoreOpen] = useState(false);+ const [sourceOpen, setSourceOpen] = useState(false);const [pending, setPending] = useState(false);const [error, setError] = useState<string | null>(null);const canReplyAll = hasAdditionalRecipients(message, ownAddresses);@@ -181,6 +183,9 @@ export function ThreadMessageActions({<button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onForward()}><Forward className="h-4 w-4" /> Forward</button>+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => { setMoreOpen(false); setSourceOpen(true); }}>+ <FileCode2 className="h-4 w-4" /> Show original+ </button><hr className="my-1 border-neutral-100" /><button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onMessageAction(message.read ? "unread" : "read")}>{message.read ? <Mail className="h-4 w-4" /> : <MailOpen className="h-4 w-4" />}@@ -202,6 +207,7 @@ export function ThreadMessageActions({</div>)}</div>+ <MessageSourceDialog messageId={message.id} open={sourceOpen} onOpenChange={setSourceOpen} /></div>);}diff --git a/src/lib/import/service.ts b/src/lib/import/service.tsindex 08425f5..c4a0f56 100644--- a/src/lib/import/service.ts+++ b/src/lib/import/service.ts@@ -2,6 +2,7 @@ import { and, eq } from "drizzle-orm";import { getDb } from "@/db";import { messages } from "@/db/schema";import { storeMessageAttachments } from "@/lib/email/attachments";+import { deleteMessageWithObjects } from "@/lib/email/message-cleanup";import { buildSnippet, parseRawMime } from "@/lib/email/parse";import { resolveThreadId } from "@/lib/email/threading";import { upsertContactFromAddress } from "@/lib/contacts/service";@@ -64,6 +65,7 @@ async function importMessageToMailbox(if (existing) return false;const messageId = newId("msg");+ const rawR2Key = `imports/${messageId}.eml`;const fromAddr = parsed.fromAddr ?? "unknown";const toAddr = parsed.toAddr ?? "";const createdAt = parsed.date ?? new Date();@@ -83,6 +85,7 @@ async function importMessageToMailbox(snippet: buildSnippet(parsed.text, parsed.html),textBody: parsed.text,htmlBody: parsed.html,+ rawR2Key,status: placement.status,read: placement.direction === "outbound",threadId: await resolveThreadId(db, {@@ -97,6 +100,9 @@ async function importMessageToMailbox(});try {+ await env.BUCKET.put(rawR2Key, input.raw, {+ httpMetadata: { contentType: "message/rfc822" },+ });await storeMessageAttachments(env, messageId, parsed.attachments, { validate: false });const contactAddress = placement.direction === "outbound" ? toAddr : fromAddr;await upsertContactFromAddress(env, {@@ -105,7 +111,7 @@ async function importMessageToMailbox(source: placement.direction === "outbound" ? "outbound" : "inbound",});} catch (error) {- await db.delete(messages).where(eq(messages.id, messageId));+ await deleteMessageWithObjects(env, db, messageId, rawR2Key);throw error;}