Email for professionals and teams
various improvements
Hieu Nguyen (Jack)f27448b9bdf7
diff --git a/drizzle/migrations/0019_merge_message_bodies.sql b/drizzle/migrations/0019_merge_message_bodies.sqlnew file mode 100644index 0000000..19119ab--- /dev/null+++ b/drizzle/migrations/0019_merge_message_bodies.sql@@ -0,0 +1,9 @@+ALTER TABLE `messages` ADD `text_body` text;+ALTER TABLE `messages` ADD `html_body` text;+ALTER TABLE `messages` ADD `raw_r2_key` text;+UPDATE `messages`+SET+ `text_body` = (SELECT `text_body` FROM `message_bodies` WHERE `message_bodies`.`message_id` = `messages`.`id`),+ `html_body` = (SELECT `html_body` FROM `message_bodies` WHERE `message_bodies`.`message_id` = `messages`.`id`),+ `raw_r2_key` = (SELECT `raw_r2_key` FROM `message_bodies` WHERE `message_bodies`.`message_id` = `messages`.`id`);+DROP TABLE `message_bodies`;diff --git a/drizzle/migrations/0020_add_calendar_templates_schedule.sql b/drizzle/migrations/0020_add_calendar_templates_schedule.sqlnew file mode 100644index 0000000..7091dba--- /dev/null+++ b/drizzle/migrations/0020_add_calendar_templates_schedule.sql@@ -0,0 +1,25 @@+ALTER TABLE `outbound_jobs` ADD `scheduled_at` integer;+CREATE TABLE `email_templates` (+ `id` text PRIMARY KEY NOT NULL,+ `user_id` text NOT NULL REFERENCES `users`(`id`) ON DELETE cascade,+ `name` text NOT NULL,+ `subject` text DEFAULT '' NOT NULL,+ `text_body` text DEFAULT '' NOT NULL,+ `created_at` integer NOT NULL,+ `updated_at` integer NOT NULL+);+CREATE INDEX `email_templates_user_idx` ON `email_templates` (`user_id`);+CREATE TABLE `calendar_events` (+ `id` text PRIMARY KEY NOT NULL,+ `user_id` text NOT NULL REFERENCES `users`(`id`) ON DELETE cascade,+ `mailbox_id` text REFERENCES `mailboxes`(`id`) ON DELETE set null,+ `title` text NOT NULL,+ `description` text DEFAULT '' NOT NULL,+ `location` text DEFAULT '' NOT NULL,+ `attendees` text DEFAULT '[]' NOT NULL,+ `starts_at` integer NOT NULL,+ `ends_at` integer NOT NULL,+ `created_at` integer NOT NULL,+ `updated_at` integer NOT NULL+);+CREATE INDEX `calendar_events_user_starts_idx` ON `calendar_events` (`user_id`, `starts_at`);diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.jsonindex d944791..1fb56ca 100644--- a/drizzle/migrations/meta/_journal.json+++ b/drizzle/migrations/meta/_journal.json@@ -134,6 +134,20 @@"when": 1788172800000,"tag": "0018_add_mailbox_domain_aliases","breakpoints": true+ },+ {+ "idx": 19,+ "version": "6",+ "when": 1788259200000,+ "tag": "0019_merge_message_bodies",+ "breakpoints": true+ },+ {+ "idx": 20,+ "version": "6",+ "when": 1788345600000,+ "tag": "0020_add_calendar_templates_schedule",+ "breakpoints": true}]}diff --git a/src/app/(admin)/accounts/page.tsx b/src/app/(admin)/accounts/page.tsxindex d471977..4565e9c 100644--- a/src/app/(admin)/accounts/page.tsx+++ b/src/app/(admin)/accounts/page.tsx@@ -9,6 +9,7 @@ import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { Select } from "@/components/ui/select";import { authFetch } from "@/lib/auth/client";+import { LicenseRequiredOverlay } from "@/components/license-required-overlay";import type { Account, AccountResponse, Domain } from "./types";export default function AccountsPage() {@@ -66,10 +67,10 @@ export default function AccountsPage() {return <div className="space-y-6"><div className="flex items-center justify-between gap-4"><div><h1 className="text-3xl font-medium text-neutral-900">Accounts</h1><p className="mt-2 text-sm text-neutral-500">Manage Team accounts and their inboxes.</p></div>{!teamRequired && <Button onClick={() => setCreateOpen(true)}><Plus className="h-4 w-4" />New account</Button>}</div>- {teamRequired ? <div className="rounded-3xl bg-white p-6"><h2 className="font-semibold">Team license required</h2><p className="mt-2 text-sm text-neutral-600">Adding user accounts is available with a Team license.</p><Button asChild className="mt-4"><Link href="/licenses">View licenses</Link></Button></div> : <div className="grid gap-3">+ <div className="relative">{teamRequired && <LicenseRequiredOverlay required="Team"><div className="min-h-48 rounded-3xl bg-white" /></LicenseRequiredOverlay>}<div className="grid gap-3">{loading && <p className="text-sm text-neutral-500">Loading...</p>}{accounts.map((account) => <Link key={account.id} href={`/accounts/${account.id}`} className="flex items-center gap-4 rounded-3xl bg-white p-5 transition-colors hover:bg-blue-50/40"><span className="relative flex h-12 w-12 shrink-0 items-center justify-center overflow-hidden rounded-full bg-blue-100 font-semibold text-blue-700">{account.name.charAt(0).toUpperCase()}{account.hasAvatar && <img src={`/api/accounts/${account.id}/avatar`} alt="" className="absolute inset-0 h-full w-full object-cover" />}</span><span className="min-w-0"><span className="flex items-center gap-2"><span className="truncate font-semibold text-neutral-900">{account.name}</span><span className="rounded-full bg-neutral-100 px-2 py-0.5 text-xs font-medium capitalize text-neutral-600">{account.role}</span></span><span className="block truncate text-sm text-neutral-500">{account.email}</span></span></Link>)}- </div>}+ </div></div><Dialog open={createOpen} onOpenChange={setCreateOpen}><DialogContent><DialogHeader><DialogTitle>Add user account</DialogTitle><DialogDescription>The user can sign in with this email and password.</DialogDescription></DialogHeader><form onSubmit={createAccount} className="space-y-4"><div className="space-y-2"><Label htmlFor="account-username">Email</Label><div className="flex h-10 overflow-hidden rounded-md border border-neutral-200 bg-white"><Input id="account-username" value={username} onChange={(event) => setUsername(event.target.value)} placeholder="username" className="min-w-0 flex-1 rounded-none border-0 shadow-none" required /><span className="flex items-center text-sm text-neutral-400">@</span><Select aria-label="Domain" value={domainId} onChange={(event) => setDomainId(event.target.value)} className="max-w-[55%] bg-transparent px-3 text-sm" required><option value="">Select domain</option>{domains.map((domain) => <option key={domain.id} value={domain.id}>{domain.hostname}</option>)}</Select></div></div><div className="space-y-2"><Label htmlFor="account-password">Password</Label><Input id="account-password" type="password" minLength={8} value={password} onChange={(event) => setPassword(event.target.value)} required /></div>diff --git a/src/app/(admin)/layout.tsx b/src/app/(admin)/layout.tsxindex 7e1d759..b6c6d4d 100644--- a/src/app/(admin)/layout.tsx+++ b/src/app/(admin)/layout.tsx@@ -21,7 +21,7 @@ export default function DashboardLayout({<SidebarProvider expandedWidth={256}><MailboxProvider><ComposeProvider>- <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#eef3fb] transition-[grid-template-columns] duration-200">+ <div className="grid h-dvh grid-cols-[var(--sidebar-width)_minmax(0,1fr)] overflow-hidden bg-[#f6f8fc] transition-[grid-template-columns] duration-200"><aside className="min-h-0 overflow-y-auto overscroll-contain px-3 py-4 scrollbar-gutter-stable"><AdminNav /></aside>@@ -30,7 +30,7 @@ export default function DashboardLayout({<LicenseIndicator /><MailboxSelector /></span>- <main className="min-h-0 min-w-0 flex-1 overflow-y-auto overscroll-contain px-6 py-10 scrollbar-gutter-stable lg:px-12">+ <main className="min-h-0 min-w-0 flex-1 overflow-y-auto overscroll-contain rounded-tl-3xl px-6 py-10 scrollbar-gutter-stable lg:px-12"><div className="w-full max-w-3xl">{children}</div></main></div>diff --git a/src/app/(admin)/loading.tsx b/src/app/(admin)/loading.tsxindex daebc9f..66b402f 100644--- a/src/app/(admin)/loading.tsx+++ b/src/app/(admin)/loading.tsx@@ -1,3 +1,13 @@-import { PageSkeleton } from "@/components/page-skeletons";+import { TableSkeleton } from "@/components/page-skeletons";-export default PageSkeleton;+export default function AdminLoading() {+ return (+ <div className="w-full max-w-3xl space-y-8 py-2">+ <div className="space-y-3">+ <div className="h-8 w-48 animate-pulse rounded bg-neutral-200" />+ <div className="h-4 w-80 animate-pulse rounded bg-neutral-100" />+ </div>+ <TableSkeleton />+ </div>+ );+}diff --git a/src/app/(admin)/mailboxes/[id]/page.tsx b/src/app/(admin)/mailboxes/[id]/page.tsxindex decfba3..0adb8d8 100644--- a/src/app/(admin)/mailboxes/[id]/page.tsx+++ b/src/app/(admin)/mailboxes/[id]/page.tsx@@ -216,7 +216,7 @@ export default function MailboxSettingsPage() {<Selectvalue={selectedUserId}onChange={(event) => setSelectedUserId(event.target.value)}- className="h-10 min-w-0 flex-1 rounded-md border border-neutral-200 bg-white px-3 text-sm"+ className="h-10 min-w-0 flex-1 text-sm"><option value="">Choose an account</option>{(sharedAccess.data?.availableUsers ?? [])diff --git a/src/app/(dashboard)/calendar/page.tsx b/src/app/(dashboard)/calendar/page.tsxnew file mode 100644index 0000000..72ae39a--- /dev/null+++ b/src/app/(dashboard)/calendar/page.tsx@@ -0,0 +1,221 @@+"use client";++import { useEffect, useState } from "react";+import { CalendarDays, Pencil, Plus, Trash2 } from "lucide-react";+import { Button } from "@/components/ui/button";+import { Input } from "@/components/ui/input";+import { authFetch } from "@/lib/auth/client";+import { useSelectedMailbox } from "@/components/mailbox-provider";++type CalendarEvent = {+ id: string;+ title: string;+ startsAt: string;+ endsAt: string;+ location: string;+ attendees: string;+};++export default function CalendarPage() {+ const [events, setEvents] = useState<CalendarEvent[]>([]);+ const [title, setTitle] = useState("");+ const [startsAt, setStartsAt] = useState("");+ const [endsAt, setEndsAt] = useState("");+ const [adding, setAdding] = useState(false);+ const [guests, setGuests] = useState("");+ const [editing, setEditing] = useState<CalendarEvent | null>(null);+ const [pendingAction, setPendingAction] = useState<"save" | string | null>(null);+ const { selectedMailbox } = useSelectedMailbox();+ useEffect(() => {+ const start = new Date();+ const end = new Date(start.getFullYear(), start.getMonth() + 1, 1);+ void authFetch(+ `/api/calendar/events?start=${start.toISOString()}&end=${end.toISOString()}`,+ )+ .then((response) => response.json())+ .then((data) => setEvents(data.events ?? []));+ }, []);+ async function addEvent() {+ setPendingAction("save");+ try {+ const response = await authFetch(+ editing ? `/api/calendar/events/${editing.id}` : "/api/calendar/events",+ {+ method: editing ? "PATCH" : "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({+ title,+ startsAt,+ endsAt,+ attendees: guests.split(","),+ mailboxId: selectedMailbox?.id,+ from:+ selectedMailbox?.senderAddresses?.[0] ??+ (selectedMailbox+ ? `${selectedMailbox.localPart}@${selectedMailbox.hostname}`+ : ""),+ }),+ },+ );+ const data = await response.json();+ if (response.ok) {+ setEvents((items) =>+ editing+ ? items.map((event) =>+ event.id === editing.id+ ? {+ ...event,+ title,+ startsAt,+ endsAt,+ attendees: JSON.stringify(+ guests.split(",").filter(Boolean),+ ),+ }+ : event,+ )+ : [...items, data.event].sort((a, b) =>+ a.startsAt.localeCompare(b.startsAt),+ ),+ );+ setTitle("");+ setStartsAt("");+ setEndsAt("");+ setGuests("");+ setEditing(null);+ setAdding(false);+ }+ } finally {+ setPendingAction(null);+ }+ }+ async function deleteEvent(id: string) {+ if (!window.confirm("Delete this event?")) return;+ setPendingAction(id);+ try {+ const response = await authFetch(`/api/calendar/events/${id}`, {+ method: "DELETE",+ });+ if (response.ok)+ setEvents((items) => items.filter((event) => event.id !== id));+ } finally {+ setPendingAction(null);+ }+ }+ function editEvent(event: CalendarEvent) {+ setEditing(event);+ setTitle(event.title);+ setStartsAt(event.startsAt.slice(0, 16));+ setEndsAt(event.endsAt.slice(0, 16));+ setGuests(JSON.parse(event.attendees || "[]").join(", "));+ setAdding(true);+ }+ return (+ <div className="mx-auto max-w-5xl p-8">+ <div className="mb-8 flex items-center justify-between">+ <div>+ <h1 className="flex items-center gap-3 text-2xl font-semibold text-neutral-900">+ <CalendarDays className="h-7 w-7 text-blue-600" />+ Calendar+ </h1>+ <p className="mt-1 text-sm text-neutral-500">+ Your upcoming events and meeting invitations.+ </p>+ </div>+ <Button disabled={pendingAction !== null} onClick={() => { setEditing(null); setAdding(true); }}>+ <Plus className="h-4 w-4" />+ New event+ </Button>+ </div>+ {adding && (+ <div className="fixed inset-0 z-50 flex items-center justify-center bg-neutral-950/35 p-4">+ <div className="w-full max-w-lg rounded-2xl bg-white p-6 shadow-2xl">+ <h2 className="text-lg font-semibold">{editing ? "Edit event" : "Create event"}</h2>+ <div className="mt-5 grid gap-3">+ <Input+ value={title}+ onChange={(event) => setTitle(event.target.value)}+ placeholder="Event title"+ />+ <Input+ value={guests}+ onChange={(event) => setGuests(event.target.value)}+ placeholder="Add guests (comma-separated emails)"+ />+ <div className="grid grid-cols-2 gap-3">+ <Input+ type="datetime-local"+ value={startsAt}+ onChange={(event) => setStartsAt(event.target.value)}+ aria-label="Start date and time"+ />+ <Input+ type="datetime-local"+ value={endsAt}+ onChange={(event) => setEndsAt(event.target.value)}+ aria-label="End date and time"+ />+ </div>+ <div className="mt-2 flex justify-end gap-2">+ <Button variant="ghost" disabled={pendingAction === "save"} onClick={() => { setEditing(null); setAdding(false); }}>+ Cancel+ </Button>+ <Button+ onClick={() => void addEvent()}+ disabled={!title || !startsAt || !endsAt || pendingAction === "save"}+ >+ {pendingAction === "save" ? (editing ? "Saving..." : "Creating...") : (editing ? "Save changes" : "Create event")}+ </Button>+ </div>+ </div>+ </div>+ </div>+ )}+ <div className="overflow-hidden rounded-xl border border-neutral-200">+ {events.length === 0 ? (+ <p className="p-8 text-center text-sm text-neutral-500">+ No events this month.+ </p>+ ) : (+ events.map((event) => (+ <div+ key={event.id}+ className="flex items-center gap-5 border-b border-neutral-100 px-5 py-4 last:border-b-0"+ >+ <div className="w-36">+ <span>{new Date(event.startsAt).toLocaleDateString()}</span>+ <time className="text-xs text-neutral-500 flex flex-col">+ <span>{new Date(event.startsAt).toLocaleTimeString()}</span>+ </time>+ </div>+ <div className="flex-1">+ <p className="font-medium text-neutral-900">{event.title}</p>+ {event.location && (+ <p className="text-sm text-neutral-500">{event.location}</p>+ )}+ </div>+ <Button+ variant="ghost"+ size="sm"+ aria-label="Edit event"+ disabled={pendingAction !== null}+ onClick={() => void editEvent(event)}+ >+ <Pencil className="h-4 w-4" />+ </Button>+ <Button+ variant="ghost"+ size="sm"+ aria-label="Delete event"+ disabled={pendingAction !== null}+ onClick={() => void deleteEvent(event.id)}+ >+ <Trash2 className="h-4 w-4" />{pendingAction === event.id && <span className="sr-only">Deleting...</span>}+ </Button>+ </div>+ ))+ )}+ </div>+ </div>+ );+}diff --git a/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts b/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.tsindex b65ac5e..557e526 100644--- a/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts+++ b/src/app/(dashboard)/inbox/[messageId]/email-html-sanitizer.ts@@ -125,6 +125,7 @@ const ALLOWED_STYLE_PROPERTIES = new Set(["word-break","word-wrap",]);+const APP_FONT_FALLBACK = "var(--font-geist-sans), system-ui, sans-serif";function isSafeLinkUrl(value: string): boolean {try {@@ -152,7 +153,10 @@ function sanitizeStyle(element: HTMLElement): void {if (!ALLOWED_STYLE_PROPERTIES.has(property)) continue;const value = element.style.getPropertyValue(property);if (/url\s*\(|expression\s*\(|javascript:|@import|behavior\s*:|-moz-binding/i.test(value)) continue;- safeDeclarations.push(`${property}: ${value}`);+ const safeValue = property === "font-family"+ ? `${value}, ${APP_FONT_FALLBACK}`+ : value;+ safeDeclarations.push(`${property}: ${safeValue}`);}if (safeDeclarations.length) {element.setAttribute("style", safeDeclarations.join("; "));diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsxindex f730740..425816d 100644--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx@@ -18,6 +18,8 @@ import { getMessageBackHref } from "@/components/message-actions/utils";import type { MessageAttachment, MessageDetailResponse } from "./types";import {fetchMessageDetail,+ fetchMessageMetadata,+ getCachedMessageDetailForDisplay,getMessageBodyDisplay,getMessageHeaderParties,resolveInlineAttachmentUrls,@@ -39,6 +41,19 @@ export default function MessageDetailPage() {let cancelled = false;async function loadMessage() {+ const cachedData = getCachedMessageDetailForDisplay(messageId);+ if (cachedData?.message && cachedData.body) {+ setData(cachedData);+ setLoading(false);+ if (cachedData.attachments !== undefined) return;+ try {+ const metadata = await fetchMessageMetadata(messageId);+ if (!cancelled) setData((current) => current ? { ...current, ...metadata } : current);+ } catch {+ // The message body remains usable if supplemental metadata is unavailable.+ }+ return;+ }setLoading(true);const nextData = await fetchMessageDetail(messageId);if (!cancelled) {@@ -155,9 +170,9 @@ export default function MessageDetailPage() {</div><div className="prose max-w-none text-neutral-900">{htmlBody ? (- <div dangerouslySetInnerHTML={{ __html: htmlBody }} />+ <div className="mx-auto" dangerouslySetInnerHTML={{ __html: htmlBody }} />) : (- <pre className="whitespace-pre-wrap text-sm text">+ <pre className="whitespace-pre-wrap text-sm text mx-auto">{cloudAttachmentResult.content}</pre>)}diff --git a/src/app/(dashboard)/inbox/[messageId]/utils.ts b/src/app/(dashboard)/inbox/[messageId]/utils.tsindex 546711f..8a7dff7 100644--- a/src/app/(dashboard)/inbox/[messageId]/utils.ts+++ b/src/app/(dashboard)/inbox/[messageId]/utils.ts@@ -1,4 +1,5 @@-import { fetchCachedMessageDetail } from "@/lib/messages/detail-cache";+import { authFetch } from "@/lib/auth/client";+import { fetchCachedMessageDetail, getCachedMessageDetail } from "@/lib/messages/detail-cache";import { getEmailAddress } from "@/lib/email/address";import { getDisplayNameForAddress } from "@/lib/contacts/utils";import { htmlToReadableText, splitRepliedEmailContent } from "@/lib/email/reply-content-utils";@@ -9,6 +10,14 @@ export async function fetchMessageDetail(messageId: string): Promise<MessageDetareturn (await fetchCachedMessageDetail(messageId)) as MessageDetailResponse;}+export function getCachedMessageDetailForDisplay(messageId: string): MessageDetailResponse | undefined {+ return getCachedMessageDetail(messageId) as MessageDetailResponse | undefined;+}++export async function fetchMessageMetadata(messageId: string): Promise<Pick<MessageDetailResponse, "attachments" | "unsubscribeUrl">> {+ return (await authFetch(`/api/messages/${messageId}/metadata`)).json();+}+export function getMessageHeaderParties(message: Message, currentAccountName?: string) {return {fromName:diff --git a/src/app/(settings)/settings/import/page.tsx b/src/app/(settings)/settings/import/page.tsxindex bae1767..6ad2b8c 100644--- a/src/app/(settings)/settings/import/page.tsx+++ b/src/app/(settings)/settings/import/page.tsx@@ -23,6 +23,7 @@ import type {ImportSourceItem,ImportSourceSection,ImportTab,+ ImportProgress,} from "./types";import {ensureImportDestination,@@ -59,10 +60,12 @@ export default function SettingsImportPage() {const [fileResult, setFileResult] = useState<ImportResult | null>(null);const [fileError, setFileError] = useState<string | null>(null);const [fileLoading, setFileLoading] = useState(false);+ const [fileProgress, setFileProgress] = useState<ImportProgress | null>(null);const [imapForm, setImapForm] = useState<ImapFormState>(initialImapForm);const [imapResult, setImapResult] = useState<ImportResult | null>(null);const [imapError, setImapError] = useState<string | null>(null);const [imapLoading, setImapLoading] = useState(false);+ const [imapProgress, setImapProgress] = useState<ImportProgress | null>(null);const selectedSources = useMemo(() => getSelectedImportSources(selectedSections),[selectedSections],@@ -93,12 +96,14 @@ export default function SettingsImportPage() {setFileLoading(true);setFileError(null);setFileResult(null);+ setFileProgress({ completed: 0, total: 100, label: "Preparing files" });try {const destination = await getDestination(fileImportSource);const result = await importMessageFiles(selectedMailbox.id,files,destination,+ (percentage) => setFileProgress({ completed: percentage, total: 100, label: percentage < 70 ? "Uploading files" : "Importing messages" }),);setFileResult(result);window.dispatchEvent(new Event("mailflare:messages-changed"));@@ -117,6 +122,7 @@ export default function SettingsImportPage() {setImapLoading(true);setImapError(null);setImapResult(null);+ setImapProgress({ completed: 0, total: 1, label: "Discovering IMAP folders" });try {const total: ImportResult = { imported: 0, skipped: 0, errors: [] };const discoveredFolders = await fetchImapFolders(imapForm);@@ -133,7 +139,8 @@ export default function SettingsImportPage() {}}- for (const source of expandedSources) {+ for (const [index, source] of expandedSources.entries()) {+ setImapProgress({ completed: index, total: expandedSources.length, label: `Importing ${source.label}` });const destination = await getDestination(source);const folder = resolveImapSourceFolder(source, discoveredFolders);const result = await importFromImap(@@ -144,6 +151,7 @@ export default function SettingsImportPage() {total.imported = (total.imported ?? 0) + (result.imported ?? 0);total.skipped = (total.skipped ?? 0) + (result.skipped ?? 0);total.errors = [...(total.errors ?? []), ...(result.errors ?? [])];+ setImapProgress({ completed: index + 1, total: expandedSources.length, label: `Imported ${source.label}` });}setImapResult(total);setImapForm((current) => ({ ...current, password: "" }));@@ -168,13 +176,14 @@ export default function SettingsImportPage() {</div><div className="space-y-6 rounded-3xl bg-white p-6">- <div className="space-y-2">+ <div className="flex flex-col gap-2"><Label htmlFor="import-source">Import source</Label><Selectid="import-source"value={activeTab}onChange={(event) => setActiveTab(event.target.value as ImportTab)}- className="h-10 w-full rounded-md border border-neutral-200 bg-white px-3 text-sm text-neutral-900 shadow-sm shadow-neutral-200/50 outline-none focus:border-blue-500 focus:ring-2 focus:ring-blue-100"+ className="text-sm w-full py-2"+ // className="h-10 w-full rounded-md border border-neutral-200 bg-white px-3 text-sm text-neutral-900 shadow-sm shadow-neutral-200/50 outline-none focus:border-blue-500 focus:ring-2 focus:ring-blue-100"><option value="file">Backup File</option><option value="imap">IMAP</option>@@ -261,6 +270,12 @@ export default function SettingsImportPage() {>{fileLoading ? "Importing..." : "Import selected files"}</Button>+ {fileProgress && (+ <div className="space-y-1 text-xs text-neutral-500" aria-live="polite">+ <div className="flex justify-between"><span>{fileProgress.label}</span><span>{fileProgress.completed}%</span></div>+ <div className="h-1.5 overflow-hidden rounded-full bg-neutral-100"><div className="h-full bg-blue-600 transition-[width]" style={{ width: `${fileProgress.completed}%` }} /></div>+ </div>+ )}{fileResult && (<p className="rounded-lg border border-green-100 bg-green-50 px-4 py-3 text-sm text-green-700">{formatImportResult(fileResult)}@@ -381,6 +396,12 @@ export default function SettingsImportPage() {<Upload className="h-4 w-4" />{imapLoading ? "Importing..." : "Import selected sources"}</Button>+ {imapProgress && (+ <div className="space-y-1 text-xs text-neutral-500" aria-live="polite">+ <div className="flex justify-between"><span>{imapProgress.label}</span><span>{imapProgress.completed}/{imapProgress.total}</span></div>+ <div className="h-1.5 overflow-hidden rounded-full bg-neutral-100"><div className="h-full bg-blue-600 transition-[width]" style={{ width: `${Math.round((imapProgress.completed / imapProgress.total) * 100)}%` }} /></div>+ </div>+ )}{imapResult && (<p className="rounded-lg border border-green-100 bg-green-50 px-4 py-3 text-sm text-green-700">{formatImportResult(imapResult)}diff --git a/src/app/(settings)/settings/import/types.d.ts b/src/app/(settings)/settings/import/types.d.tsindex 1ce8020..f7b6102 100644--- a/src/app/(settings)/settings/import/types.d.ts+++ b/src/app/(settings)/settings/import/types.d.ts@@ -40,3 +40,9 @@ export type ImportFolderSummary = {id: string;name: string;};++export type ImportProgress = {+ completed: number;+ label: string;+ total: number;+};diff --git a/src/app/api/calendar/events/[eventId]/route.ts b/src/app/api/calendar/events/[eventId]/route.tsnew file mode 100644index 0000000..c477434--- /dev/null+++ b/src/app/api/calendar/events/[eventId]/route.ts@@ -0,0 +1,36 @@+import { and, eq } from "drizzle-orm";+import { NextResponse } from "next/server";+import { getDb } from "@/db";+import { calendarEvents } from "@/db/schema";+import { requireUser } from "@/lib/auth/cookies";+import { getEnv } from "@/lib/cloudflare";+import { createCalendarInvitation } from "@/lib/calendar/utils";+import { sendEmail } from "@/lib/email/send";+import type { CalendarEventInput } from "../types";+import type { CalendarEventRouteParams } from "./types";++export async function PATCH(request: Request, { params }: CalendarEventRouteParams) {+ const env = getEnv();+ const user = await requireUser(env, request);+ const { eventId } = await params;+ const input = await request.json() as CalendarEventInput;+ const startsAt = new Date(input.startsAt);+ const endsAt = new Date(input.endsAt);+ if (!input.title?.trim() || Number.isNaN(startsAt.getTime()) || Number.isNaN(endsAt.getTime()) || endsAt <= startsAt) return NextResponse.json({ error: "Enter a title and valid event times" }, { status: 400 });+ const db = getDb(env);+ const [existing] = await db.select().from(calendarEvents).where(and(eq(calendarEvents.id, eventId), eq(calendarEvents.userId, user.id))).limit(1);+ if (!existing) return NextResponse.json({ error: "Event not found" }, { status: 404 });+ const attendees = (input.attendees ?? []).map((email) => email.trim()).filter((email) => /^\S+@\S+\.\S+$/.test(email));+ const event = { ...existing, title: input.title.trim(), description: input.description?.trim() ?? "", location: input.location?.trim() ?? "", attendees: JSON.stringify(attendees), startsAt, endsAt };+ await db.update(calendarEvents).set({ title: event.title, description: event.description, location: event.location, attendees: event.attendees, startsAt, endsAt, updatedAt: new Date() }).where(eq(calendarEvents.id, eventId));+ if (attendees.length && existing.mailboxId && input.from) { const file = createCalendarInvitation({ ...event, uid: eventId }); await Promise.all(attendees.map((to) => sendEmail(env, { userId: user.id, mailboxId: existing.mailboxId!, from: input.from!, to, subject: `Updated invitation: ${event.title}`, text: event.description || `This event has been updated: ${event.title}.`, attachments: [{ filename: "invite.ics", type: "text/calendar; charset=utf-8", content: file }] }))); }+ return NextResponse.json({ ok: true });+}++export async function DELETE(_request: Request, { params }: CalendarEventRouteParams) {+ const env = getEnv();+ const user = await requireUser(env, _request);+ const { eventId } = await params;+ await getDb(env).delete(calendarEvents).where(and(eq(calendarEvents.id, eventId), eq(calendarEvents.userId, user.id)));+ return NextResponse.json({ ok: true });+}diff --git a/src/app/api/calendar/events/[eventId]/types.d.ts b/src/app/api/calendar/events/[eventId]/types.d.tsnew file mode 100644index 0000000..5c826c2--- /dev/null+++ b/src/app/api/calendar/events/[eventId]/types.d.ts@@ -0,0 +1,3 @@+export type CalendarEventRouteParams = {+ params: Promise<{ eventId: string }>;+};diff --git a/src/app/api/calendar/events/route.ts b/src/app/api/calendar/events/route.tsnew file mode 100644index 0000000..6434978--- /dev/null+++ b/src/app/api/calendar/events/route.ts@@ -0,0 +1,37 @@+import { and, eq, gte, lt } from "drizzle-orm";+import { NextResponse } from "next/server";+import { getDb } from "@/db";+import { calendarEvents } from "@/db/schema";+import { requireUser } from "@/lib/auth/cookies";+import { getEnv } from "@/lib/cloudflare";+import { newId } from "@/lib/ids";+import { sendEmail } from "@/lib/email/send";+import { createCalendarInvitation } from "@/lib/calendar/utils";+import type { CalendarEventInput } from "./types";++export async function GET(request: Request) {+ const env = getEnv();+ const user = await requireUser(env, request);+ const url = new URL(request.url);+ const start = new Date(url.searchParams.get("start") ?? Date.now());+ const end = new Date(url.searchParams.get("end") ?? start.getTime() + 31 * 86_400_000);+ const events = await getDb(env).select().from(calendarEvents).where(and(eq(calendarEvents.userId, user.id), gte(calendarEvents.startsAt, start), lt(calendarEvents.startsAt, end))).orderBy(calendarEvents.startsAt);+ return NextResponse.json({ events });+}++export async function POST(request: Request) {+ const env = getEnv();+ const user = await requireUser(env, request);+ const input = await request.json() as CalendarEventInput;+ const startsAt = new Date(input.startsAt);+ const endsAt = new Date(input.endsAt);+ if (!input.title?.trim() || Number.isNaN(startsAt.getTime()) || Number.isNaN(endsAt.getTime()) || endsAt <= startsAt) return NextResponse.json({ error: "Enter a title and valid event times" }, { status: 400 });+ const attendees = (input.attendees ?? []).map((email) => email.trim()).filter((email) => /^\S+@\S+\.\S+$/.test(email));+ const event = { id: newId("evt"), userId: user.id, mailboxId: input.mailboxId ?? null, title: input.title.trim(), description: input.description?.trim() ?? "", location: input.location?.trim() ?? "", attendees: JSON.stringify(attendees), startsAt, endsAt };+ await getDb(env).insert(calendarEvents).values(event);+ if (attendees.length && input.mailboxId) {+ const calendarFile = createCalendarInvitation({ ...event, uid: event.id });+ await Promise.all(attendees.map((to) => sendEmail(env, { userId: user.id, mailboxId: input.mailboxId!, from: input.from ?? "", to, subject: `Invitation: ${event.title}`, text: event.description || `You are invited to ${event.title}.`, attachments: [{ filename: "invite.ics", type: "text/calendar; charset=utf-8", content: calendarFile }] })));+ }+ return NextResponse.json({ event });+}diff --git a/src/app/api/calendar/events/types.d.ts b/src/app/api/calendar/events/types.d.tsnew file mode 100644index 0000000..67baa84--- /dev/null+++ b/src/app/api/calendar/events/types.d.ts@@ -0,0 +1,10 @@+export type CalendarEventInput = {+ title: string;+ description?: string;+ location?: string;+ attendees?: string[];+ startsAt: string;+ endsAt: string;+ mailboxId?: string | null;+ from?: string;+};diff --git a/src/app/api/drafts/[id]/route.ts b/src/app/api/drafts/[id]/route.tsindex cca36a4..8f8daa0 100644--- a/src/app/api/drafts/[id]/route.ts+++ b/src/app/api/drafts/[id]/route.ts@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";import { eq } from "drizzle-orm";import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";import { requireUser } from "@/lib/auth/cookies";import { buildSnippet } from "@/lib/email/parse";import type { DraftPayload, DraftRouteParams } from "./types";@@ -57,16 +57,10 @@ export async function PATCH(request: Request, { params }: DraftRouteParams) {toAddr: input.to ?? "",subject: input.subject ?? null,snippet: buildSnippet(text || null, html || null),- })- .where(eq(messages.id, id));-- await db- .update(messageBodies)- .set({textBody: text || null,htmlBody: html || null,})- .where(eq(messageBodies.messageId, id));+ .where(eq(messages.id, id));return NextResponse.json({ draft: { id } });}diff --git a/src/app/api/drafts/[id]/utils.ts b/src/app/api/drafts/[id]/utils.tsindex 0541092..820971a 100644--- a/src/app/api/drafts/[id]/utils.ts+++ b/src/app/api/drafts/[id]/utils.ts@@ -1,6 +1,6 @@import { eq } from "drizzle-orm";import type { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";type Db = ReturnType<typeof getDb>;@@ -14,11 +14,10 @@ export function selectDraftWithBody(db: Db, userId: string, draftId: string) {toAddr: messages.toAddr,subject: messages.subject,status: messages.status,- textBody: messageBodies.textBody,- htmlBody: messageBodies.htmlBody,+ textBody: messages.textBody,+ htmlBody: messages.htmlBody,}).from(messages)- .leftJoin(messageBodies, eq(messageBodies.messageId, messages.id)).where(eq(messages.id, draftId)).limit(1).then(([draft]) => (draft && draft.userId === userId && draft.status === "draft" ? draft : null));diff --git a/src/app/api/drafts/route.ts b/src/app/api/drafts/route.tsindex 418a1f2..3c781fa 100644--- a/src/app/api/drafts/route.ts+++ b/src/app/api/drafts/route.ts@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";import { and, desc, eq } from "drizzle-orm";import { getEnv } from "@/lib/cloudflare";import { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";import { requireUser } from "@/lib/auth/cookies";import { newId } from "@/lib/ids";import { buildSnippet } from "@/lib/email/parse";@@ -62,15 +62,10 @@ export async function POST(request: Request) {toAddr: input.to ?? "",subject: input.subject ?? null,snippet: buildSnippet(text || null, html || null),- status: "draft",- read: true,- });-- await db.insert(messageBodies).values({- id: newId(),- messageId: draftId,textBody: text || null,htmlBody: html || null,+ status: "draft",+ read: true,});return NextResponse.json({ draft: { id: draftId } });diff --git a/src/app/api/messages/[messageId]/metadata/route.ts b/src/app/api/messages/[messageId]/metadata/route.tsnew file mode 100644index 0000000..f883853--- /dev/null+++ b/src/app/api/messages/[messageId]/metadata/route.ts@@ -0,0 +1,16 @@+import { NextResponse } from "next/server";+import { getCurrentUser } from "@/lib/auth/cookies";+import { getEnv } from "@/lib/cloudflare";+import { getMessageMetadataForUser } from "@/lib/email/inbound";+import type { MessageMetadataRouteParams } from "./types";++export async function GET(request: Request, { params }: MessageMetadataRouteParams) {+ const env = getEnv();+ const user = await getCurrentUser(env, request);+ if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });++ const { messageId } = await params;+ const metadata = await getMessageMetadataForUser(env, user, messageId);+ if (!metadata) return NextResponse.json({ error: "Not found" }, { status: 404 });+ return NextResponse.json(metadata);+}diff --git a/src/app/api/messages/[messageId]/metadata/types.d.ts b/src/app/api/messages/[messageId]/metadata/types.d.tsnew file mode 100644index 0000000..206d1e8--- /dev/null+++ b/src/app/api/messages/[messageId]/metadata/types.d.ts@@ -0,0 +1,3 @@+export type MessageMetadataRouteParams = {+ params: Promise<{ messageId: string }>;+};diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.tsindex 5a86783..13bd1e6 100644--- a/src/app/api/messages/route.ts+++ b/src/app/api/messages/route.ts@@ -7,7 +7,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";+import { buildSnippet } from "@/lib/email/parse";import { getMailboxAccessLevel, listAccessibleMailboxes } from "@/lib/mailboxes/access";export async function GET(request: Request) {@@ -118,12 +118,12 @@ export async function GET(request: Request) {] as const),),);- const enrichedRows = rows.map((message) => {+ const enrichedRows = rows.map(({ rawR2Key: _rawR2Key, ...message }) => {const contactMap = contactMapsByUserId.get(message.userId);const accountName = message.mailboxId ? mailboxNameMap.get(message.mailboxId) : null;return {...message,- snippet: getLatestEmailContent(message.snippet),+ snippet: buildSnippet(message.textBody, message.htmlBody) || message.snippet,fromContactName:(message.direction === "outbound" ? accountName : null) ??contactMap?.get(normalizeEmailAddress(message.fromAddr)) ??diff --git a/src/components/components-nav.tsx b/src/components/components-nav.tsxindex 95b045a..f1a9227 100644--- a/src/components/components-nav.tsx+++ b/src/components/components-nav.tsx@@ -1,4 +1,3 @@-import Link from "next/link";import type { DragEvent, MouseEvent } from "react";import { useEffect, useState } from "react";@@ -9,23 +8,28 @@ import { getMessageDragData } from "@/lib/messages/drag-utils";import { useSelectedMailbox } from "./mailbox-provider";import { useSidebar } from "./sidebar-state";import { useCompose } from "./compose/compose-context";-import { preloadMailboxPage, waitForNavigationProgress } from "./components-nav-utils";+import {+ preloadMailboxPage,+ waitForNavigationProgress,+} from "./components-nav-utils";import type { NavLink } from "./components-nav-types";-export function NavItem({ link }:{ link: NavLink }) {+export function NavItem({ link }: { link: NavLink }) {const pathname = usePathname();const router = useRouter();const { openComposer } = useCompose();const { selectedMailbox } = useSelectedMailbox();const { minimal } = useSidebar();const [dragOver, setDragOver] = useState(false);- const [navigationProgress, setNavigationProgress] = useState<number | null>(null);+ const [navigationProgress, setNavigationProgress] = useState<number | null>(+ null,+ );useEffect(() => {- if (navigationProgress === null) return;- setNavigationProgress(100);- const timer = window.setTimeout(() => setNavigationProgress(null), 220);- return () => window.clearTimeout(timer);+ if (navigationProgress === null) return;+ setNavigationProgress(100);+ const timer = window.setTimeout(() => setNavigationProgress(null), 220);+ return () => window.clearTimeout(timer);}, [pathname]);if (!link.href) {@@ -37,12 +41,12 @@ export function NavItem({ link }:{ link: NavLink }) {const active = pathname === link.href || pathname.startsWith(`${link.href}/`);const classes = cn("flex h-9 items-center gap-3 rounded-r-full text-sm font-medium text-neutral-700 transition-colors hover:bg-blue-50",- minimal && "mx-auto w-10 justify-center rounded-full px-0",+ minimal && "relative mx-auto w-10 justify-center rounded-full px-0",active && "bg-blue-100 text-blue-900",dragOver && "bg-blue-50 text-blue-900 ring-1 ring-blue-200",link.primary &&"mb-3 h-12 w-fit rounded-2xl bg-blue-100 px-5 text-blue-950 shadow-sm hover:bg-blue-200",- link.primary && minimal && "h-11 w-11 rounded-2xl px-0",+ link.primary && minimal && "h-11 w-11 rounded-2xl px-0",);const dropProps = link.onMessageDrop? {@@ -68,41 +72,59 @@ export function NavItem({ link }:{ link: NavLink }) {type="button"onClick={openComposer}className={classes}- title={minimal ? link.label : undefined}+ title={minimal ? link.label : undefined}{...dropProps}>- <Icon className="h-4 w-4" style={{ color: link.iconColor }} />- {!minimal && <span className="flex-1">{link.label}</span>}+ <Icon+ size={21}+ style={{ color: link.iconColor }}+ />+ {!minimal && <span className="flex-1">{link.label}</span>}{!minimal && typeof link.count === "number" && link.count > 0 && (<span className="ml-auto mr-3 rounded-full px-2 py-0.5 text-sm font-semibold text-neutral-700">{link.count > 99 ? "99+" : link.count}</span>)}+ {minimal && typeof link.count === "number" && link.count > 0 && (+ <span className="absolute -right-1 -top-1 min-w-4 rounded-full bg-blue-600 px-1 text-center text-[10px] font-semibold leading-4 text-white">+ {link.count > 99 ? "99+" : link.count}+ </span>+ )}</button>);}async function navigate(event: MouseEvent<HTMLAnchorElement>) {- if (!link.preloadMessages || active || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;- event.preventDefault();- setNavigationProgress(12);- const timer = window.setInterval(() => {- setNavigationProgress((current) => current === null ? 12 : Math.min(90, current + 8));- }, 80);- try {- router.prefetch(link.href!);- await Promise.all([- preloadMailboxPage(link.href!, selectedMailbox?.id),- waitForNavigationProgress(),- ]);- setNavigationProgress(100);- await waitForNavigationProgress(160);- router.push(link.href!);- } catch {- setNavigationProgress(null);- } finally {- window.clearInterval(timer);- }+ if (+ !link.preloadMessages ||+ active ||+ event.metaKey ||+ event.ctrlKey ||+ event.shiftKey ||+ event.altKey+ )+ return;+ event.preventDefault();+ setNavigationProgress(12);+ const timer = window.setInterval(() => {+ setNavigationProgress((current) =>+ current === null ? 12 : Math.min(90, current + 8),+ );+ }, 80);+ try {+ router.prefetch(link.href!);+ await Promise.all([+ preloadMailboxPage(link.href!, selectedMailbox?.id),+ waitForNavigationProgress(),+ ]);+ setNavigationProgress(100);+ await waitForNavigationProgress(160);+ router.push(link.href!);+ } catch {+ setNavigationProgress(null);+ } finally {+ window.clearInterval(timer);+ }}return (@@ -118,17 +140,26 @@ export function NavItem({ link }:{ link: NavLink }) {<Linkhref={link.href}onClick={navigate}- title={minimal ? link.label : undefined}+ title={minimal ? link.label : undefined}className={cn(!minimal && "-ml-3 pl-6", classes)}{...dropProps}>- <Icon className="h-4 w-4" style={{ color: link.iconColor }} />- {!minimal && <span className="flex-1">{link.label}</span>}+ <Icon+ // className={minimal ? "h-4 w-4" : "h-5 w-5"}+ style={{ color: link.iconColor }}+ size={18}+ />+ {!minimal && <span className="flex-1">{link.label}</span>}{!minimal && typeof link.count === "number" && link.count > 0 && (<span className="ml-auto mr-3 rounded-full px-2 py-0.5 text-sm font-semibold text-neutral-700">{link.count > 99 ? "99+" : link.count}</span>)}+ {minimal && typeof link.count === "number" && link.count > 0 && (+ <span className="absolute -right-1 -top-1 min-w-4 rounded-full bg-blue-600 px-1 text-center text-[10px] font-semibold leading-4 text-white">+ {link.count > 99 ? "99+" : link.count}+ </span>+ )}</Link></>);diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsxindex a9ee967..9951b27 100644--- a/src/components/dashboard-nav.tsx+++ b/src/components/dashboard-nav.tsx@@ -29,13 +29,20 @@ import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { useMessageCounts } from "@/hooks/use-message-counts";import { authFetch } from "@/lib/auth/client";-import { DEFAULT_FOLDER_COLOR, FOLDER_COLOR_OPTIONS } from "@/lib/folders/colors";+import {+ DEFAULT_FOLDER_COLOR,+ FOLDER_COLOR_OPTIONS,+} from "@/lib/folders/colors";import type { FolderColor } from "@/lib/folders/types";import { cn } from "@/lib/utils";import { NavItem } from "./components-nav";import type { NavLink } from "./components-nav-types";import type { CustomFolder } from "./dashboard-nav-types";-import { getFolderNavCount, moveMessagesToCustomFolder, moveMessagesToSystemFolder } from "./dashboard-nav-utils";+import {+ getFolderNavCount,+ moveMessagesToCustomFolder,+ moveMessagesToSystemFolder,+} from "./dashboard-nav-utils";import { SidebarFooter } from "./sidebar-footer";import { SidebarHeader } from "./sidebar-header";import { useSidebar } from "./sidebar-state";@@ -47,7 +54,12 @@ const links = [{ href: "/snoozed", label: "Snoozed", icon: Clock, preloadMessages: true },{ href: "/sent", label: "Sent", icon: Send, preloadMessages: true },{ href: "/drafts", label: "Drafts", icon: FileText, preloadMessages: true },- { href: "/archived", label: "Archived", icon: Archive, preloadMessages: true },+ {+ href: "/archived",+ label: "Archived",+ icon: Archive,+ preloadMessages: true,+ },{ href: "/spam", label: "Spam", icon: ShieldAlert, preloadMessages: true },{ href: "/trash", label: "Trash", icon: Trash2, preloadMessages: true },];@@ -58,7 +70,8 @@ export function DashboardNav({ className }: { className?: string }) {const { counts } = useMessageCounts(selectedMailbox?.id, !isLoading);const [folders, setFolders] = useState<CustomFolder[]>([]);const [newFolderName, setNewFolderName] = useState("");- const [newFolderColor, setNewFolderColor] = useState<FolderColor>(DEFAULT_FOLDER_COLOR);+ const [newFolderColor, setNewFolderColor] =+ useState<FolderColor>(DEFAULT_FOLDER_COLOR);const [addingFolder, setAddingFolder] = useState(false);const [folderDialogOpen, setFolderDialogOpen] = useState(false);const linksWithCounts: NavLink[] = links.map((link): NavLink => {@@ -81,21 +94,24 @@ export function DashboardNav({ className }: { className?: string }) {return {...link,count: getFolderNavCount("archived", counts.folders),- onMessageDrop: (messageIds: string[]) => void moveMessagesToSystemFolder(messageIds, "archive"),+ onMessageDrop: (messageIds: string[]) =>+ void moveMessagesToSystemFolder(messageIds, "archive"),};}if (link.href === "/spam") {return {...link,count: getFolderNavCount("spam", counts.folders),- onMessageDrop: (messageIds: string[]) => void moveMessagesToSystemFolder(messageIds, "spam"),+ onMessageDrop: (messageIds: string[]) =>+ void moveMessagesToSystemFolder(messageIds, "spam"),};}if (link.href === "/trash") {return {...link,count: getFolderNavCount("trash", counts.folders),- onMessageDrop: (messageIds: string[]) => void moveMessagesToSystemFolder(messageIds, "trash"),+ onMessageDrop: (messageIds: string[]) =>+ void moveMessagesToSystemFolder(messageIds, "trash"),};}return link;@@ -110,7 +126,9 @@ export function DashboardNav({ className }: { className?: string }) {let cancelled = false;const params = new URLSearchParams({ mailboxId: selectedMailbox.id });authFetch(`/api/folders?${params.toString()}`)- .then((response) => response.json() as Promise<{ folders?: CustomFolder[] }>)+ .then(+ (response) => response.json() as Promise<{ folders?: CustomFolder[] }>,+ ).then((data) => {if (!cancelled) setFolders(data.folders ?? []);})@@ -140,7 +158,9 @@ export function DashboardNav({ className }: { className?: string }) {});if (!response.ok) return;const folder = (await response.json()) as CustomFolder;- setFolders((items) => [...items, folder].sort((a, b) => a.name.localeCompare(b.name)));+ setFolders((items) =>+ [...items, folder].sort((a, b) => a.name.localeCompare(b.name)),+ );setNewFolderName("");setNewFolderColor(DEFAULT_FOLDER_COLOR);setFolderDialogOpen(false);@@ -152,66 +172,81 @@ export function DashboardNav({ className }: { className?: string }) {return (<nav className={cn("flex min-h-full flex-col gap-1", className)}><SidebarHeader href="/inbox" />- {linksWithCounts.map((link, i) => <NavItem link={link} key={`nav-${link.href || i}`} />)}- {!minimal && <div className="mt-2 flex h-8 items-center justify-between px-3">- <span className="text-xs font-medium uppercase tracking-wide text-neutral-400">Folders</span>- {selectedMailbox && (- <Dialog open={folderDialogOpen} onOpenChange={setFolderDialogOpen}>- <DialogTrigger asChild>- <button- type="button"- className="flex h-7 w-7 items-center justify-center rounded-lg text-neutral-500 hover:bg-blue-50 hover:text-blue-700"- aria-label="Create folder"- >- <Plus className="h-4 w-4" />- </button>- </DialogTrigger>- <DialogContent>- <DialogHeader>- <DialogTitle>Create folder</DialogTitle>- <DialogDescription>Add a folder to the selected mailbox.</DialogDescription>- </DialogHeader>- <form onSubmit={createFolder} className="space-y-4">- <div className="space-y-2">- <Label htmlFor="folderName">Folder name</Label>- <Input- id="folderName"- value={newFolderName}- onChange={(event) => setNewFolderName(event.target.value)}- placeholder="Receipts"- autoFocus- />- </div>- <div className="space-y-2">- <Label>Color</Label>- <div className="flex flex-wrap gap-2" role="radiogroup" aria-label="Folder color">- {FOLDER_COLOR_OPTIONS.map((option) => (- <button- key={option.value}- type="button"- role="radio"- aria-checked={newFolderColor === option.value}- aria-label={option.label}- title={option.label}- onClick={() => setNewFolderColor(option.value)}- className={`h-8 w-8 rounded-full border-2 transition-transform hover:scale-110 ${- newFolderColor === option.value- ? "border-neutral-900 ring-2 ring-neutral-300 ring-offset-2"- : "border-transparent"- }`}- style={{ backgroundColor: option.value }}- />- ))}+ {linksWithCounts.map((link, i) => (+ <NavItem link={link} key={`nav-${link.href || i}`} />+ ))}+ {!minimal && (+ <div className="mt-2 flex h-8 items-center justify-between px-3">+ <span className="text-xs font-medium uppercase tracking-wide text-neutral-400">+ Folders+ </span>+ {selectedMailbox && (+ <Dialog open={folderDialogOpen} onOpenChange={setFolderDialogOpen}>+ <DialogTrigger asChild>+ <button+ type="button"+ className="flex h-7 w-7 items-center justify-center rounded-lg text-neutral-500 hover:bg-blue-50 hover:text-blue-700"+ aria-label="Create folder"+ >+ <Plus className="h-4 w-4" />+ </button>+ </DialogTrigger>+ <DialogContent>+ <DialogHeader>+ <DialogTitle>Create folder</DialogTitle>+ <DialogDescription>+ Add a folder to the selected mailbox.+ </DialogDescription>+ </DialogHeader>+ <form onSubmit={createFolder} className="space-y-4">+ <div className="space-y-2">+ <Label htmlFor="folderName">Folder name</Label>+ <Input+ id="folderName"+ value={newFolderName}+ onChange={(event) => setNewFolderName(event.target.value)}+ placeholder="Receipts"+ autoFocus+ /></div>- </div>- <Button type="submit" disabled={addingFolder || !newFolderName.trim()}>- {addingFolder ? "Creating..." : "Create folder"}- </Button>- </form>- </DialogContent>- </Dialog>- )}- </div>}+ <div className="space-y-2">+ <Label>Color</Label>+ <div+ className="flex flex-wrap gap-2"+ role="radiogroup"+ aria-label="Folder color"+ >+ {FOLDER_COLOR_OPTIONS.map((option) => (+ <button+ key={option.value}+ type="button"+ role="radio"+ aria-checked={newFolderColor === option.value}+ aria-label={option.label}+ title={option.label}+ onClick={() => setNewFolderColor(option.value)}+ className={`h-8 w-8 rounded-full border-2 transition-transform hover:scale-110 ${+ newFolderColor === option.value+ ? "border-neutral-900 ring-2 ring-neutral-300 ring-offset-2"+ : "border-transparent"+ }`}+ style={{ backgroundColor: option.value }}+ />+ ))}+ </div>+ </div>+ <Button+ type="submit"+ disabled={addingFolder || !newFolderName.trim()}+ >+ {addingFolder ? "Creating..." : "Create folder"}+ </Button>+ </form>+ </DialogContent>+ </Dialog>+ )}+ </div>+ )}{!minimal && folders.length === 0 && (<div className="mx-3 rounded-lg border border-dashed border-neutral-200 px-3 py-3 text-xs text-neutral-400">No folders yet@@ -227,7 +262,8 @@ export function DashboardNav({ className }: { className?: string }) {preloadMessages: true,iconColor: folder.color,count: counts.customFolders[folder.id]?.unread,- onMessageDrop: (messageIds: string[]) => void moveMessagesToCustomFolder(messageIds, folder.id),+ onMessageDrop: (messageIds: string[]) =>+ void moveMessagesToCustomFolder(messageIds, folder.id),}}/>))}diff --git a/src/components/license-required-overlay-types.d.ts b/src/components/license-required-overlay-types.d.tsnew file mode 100644index 0000000..47c7856--- /dev/null+++ b/src/components/license-required-overlay-types.d.ts@@ -0,0 +1,6 @@+import type { ReactNode } from "react";++export type LicenseRequiredOverlayProps = {+ required: "Pro" | "Team";+ children: ReactNode;+};diff --git a/src/components/license-required-overlay.tsx b/src/components/license-required-overlay.tsxnew file mode 100644index 0000000..703e240--- /dev/null+++ b/src/components/license-required-overlay.tsx@@ -0,0 +1,8 @@+import Link from "next/link";+import { LockKeyhole } from "lucide-react";+import { Button } from "@/components/ui/button";+import type { LicenseRequiredOverlayProps } from "./license-required-overlay-types";++export function LicenseRequiredOverlay({ required, children }: LicenseRequiredOverlayProps) {+ return <div className="relative">{children}<div className="absolute inset-0 z-10 flex items-center justify-center rounded-3xl bg-white/50 p-6 backdrop-blur-[1px]"><div className="max-w-sm rounded-2xl border border-neutral-200 bg-white p-6 text-center shadow-xl"><LockKeyhole className="mx-auto h-6 w-6 text-blue-600" /><h2 className="mt-3 font-semibold text-neutral-900">{required} license required</h2><p className="mt-2 text-sm text-neutral-600">Upgrade your license to use this feature.</p><Button asChild className="mt-4"><Link href="/licenses">View licenses</Link></Button></div></div></div>;+}diff --git a/src/components/mailbox-selector.tsx b/src/components/mailbox-selector.tsxindex 4b43d65..1c058b9 100644--- a/src/components/mailbox-selector.tsx+++ b/src/components/mailbox-selector.tsx@@ -2,7 +2,7 @@import Link from "next/link";import { usePathname, useRouter } from "next/navigation";-import { Check, LogOut, ShieldCheck, UserRound, UsersRound } from "lucide-react";+import { CalendarDays, Check, LogOut, ShieldCheck, UserRound, UsersRound } from "lucide-react";import { useEffect, useRef, useState } from "react";import { useSelectedMailbox } from "@/components/mailbox-provider";import { useMessageCounts } from "@/hooks/use-message-counts";@@ -235,6 +235,14 @@ export function MailboxSelector() {</div><Check className="h-5 w-5 shrink-0 text-blue-600" /></div>+ <Link+ href="/calendar"+ onClick={() => setOpen(false)}+ className="mt-4 flex items-center gap-3 rounded-xl px-3 py-2 text-sm font-medium text-neutral-700 hover:bg-[#f2f6fc]"+ >+ <CalendarDays className="h-5 w-5 text-neutral-600" />+ Calendar+ </Link></div>{otherMailboxes.length > 0 && (diff --git a/src/components/message-actions/message-actions.tsx b/src/components/message-actions/message-actions.tsxindex d9282b3..f594fda 100644--- a/src/components/message-actions/message-actions.tsx+++ b/src/components/message-actions/message-actions.tsx@@ -2,7 +2,7 @@import { createElement, useState } from "react";import { useRouter } from "next/navigation";-import { Archive, Ban, Icon, Mail, MailOpen, MoreVertical, Reply, ShieldAlert, Trash2 } from "lucide-react";+import { Archive, Ban, BellOff, Mail, MailOpen, MoreVertical, Reply, ShieldAlert, Trash2 } from "lucide-react";import { useCompose } from "@/components/compose/compose-context";import { Button } from "@/components/ui/button";import { Tooltip } from "@/components/ui/tooltip";@@ -204,21 +204,22 @@ export function MessageActions({<><buttontype="button"- className="w-full rounded-lg px-3 py-2 text-left text-sm text-neutral-700 hover:bg-neutral-100 disabled:cursor-not-allowed disabled:text-neutral-400"- disabled={!unsubscribeUrl && status === "trash"}- onClick={() => void onUnsubscribe()}- >- Unsubscribe+ 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 disabled:cursor-not-allowed disabled:text-neutral-400"+ disabled={!unsubscribeUrl && status === "trash"}+ onClick={() => void onUnsubscribe()}+ >+ <BellOff className="h-4 w-4 shrink-0" />+ Unsubscribe</button><buttontype="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"+ 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={() => void onBlockContact()}><Ban className="h-4 w-4" />Block contact</button>- <hr />+ <hr className="my-1 border-neutral-100" /></>)}<p className="mt-1 px-3 pb-1 pt-2 text-sm font-medium text-neutral-500">@@ -228,7 +229,7 @@ export function MessageActions({<buttonkey={item.action}type="button"- className="w-full rounded-lg px-3 py-2 text-neutral-700 hover:bg-neutral-100 flex flex-row gap-2 items-center cursor-pointer"+ 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={() => void runAction(item.action)}>{createElement(item.icon, { size: 16 })}diff --git a/src/components/messages/message-folder-configs.ts b/src/components/messages/message-folder-configs.tsindex b257dd4..060ddb1 100644--- a/src/components/messages/message-folder-configs.ts+++ b/src/components/messages/message-folder-configs.ts@@ -7,7 +7,7 @@ export const inboxFolderConfig: MessageFolderConfig = {emptyText: "No emails",hrefPrefix: "/inbox",icon: Star,- headerIcons: [MailOpen, Clock],+ // headerIcons: [MailOpen, Clock],showRowBadge: false,};@@ -35,7 +35,7 @@ export const sentFolderConfig: MessageFolderConfig = {emptyText: "No emails",hrefPrefix: "/sent",icon: Send,- headerIcons: [MailOpen, Clock],+ // headerIcons: [MailOpen, Clock],badgeVariant: "outline",};diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsxindex 59127b2..d81f026 100644--- a/src/components/messages/message-folder-page.tsx+++ b/src/components/messages/message-folder-page.tsx@@ -2,11 +2,11 @@import Link from "next/link";import { useEffect, useMemo, useState } from "react";-import { ChevronLeft, ChevronRight } from "lucide-react";+import type { MouseEvent } from "react";+import { ChevronLeft, ChevronRight, ListFilter } from "lucide-react";import { Button } from "@/components/ui/button";import { Checkbox } from "@/components/ui/checkbox";import { Tooltip } from "@/components/ui/tooltip";-import { SkeletonRows } from "@/components/ui/skeleton";import { useCompose } from "@/components/compose/compose-context";import { useMailSearch } from "@/components/mail-search/mail-search-context";import { useSelectedMailbox } from "@/components/mailbox-provider";@@ -48,13 +48,27 @@ function MessageListRow({const { openDraftComposer } = useCompose();const [read, setRead] = useState(message.read);const [starred, setStarred] = useState(message.starred);+ useEffect(() => setRead(message.read), [message.read]);+ useEffect(() => setStarred(message.starred), [message.starred]);const rowMessage = { ...message, read, starred };const unread = rowMessage.direction === "inbound" && !rowMessage.read;const draggable = config.folder === "inbox" && message.direction === "inbound";const party = getMessageParty(rowMessage, config.folder, currentAccountName);const preview = getMessagePreview(rowMessage, config.folder);const href = `${config.hrefPrefix}/${message.id}`;- const navigation = useMessageNavigation(href, message.id);+ const navigation = useMessageNavigation(href, rowMessage);++ function onMessageNavigate(event: MouseEvent<HTMLAnchorElement>) {+ if (unread && !event.metaKey && !event.ctrlKey && !event.shiftKey && !event.altKey) {+ setRead(true);+ dispatchMessageCountsDelta({ inboxUnreadDelta: -1 });+ void runBulkMessageAction([message.id], "read", false).catch(() => {+ setRead(false);+ dispatchMessageCountsDelta({ inboxUnreadDelta: 1 });+ });+ }+ navigation.onNavigate(event, unread);+ }if (compact && config.folder !== "drafts") {return (@@ -79,7 +93,7 @@ function MessageListRow({className="mt-1 h-4 w-4 rounded border-neutral-300"aria-label={`Select message from ${party}`}/>- <Link href={href} onClick={navigation.onNavigate} className="min-w-0">+ <Link href={href} onClick={onMessageNavigate} className="min-w-0"><span className="flex items-baseline justify-between gap-3"><span className={getMessagePartyClassName(message, config.folder)}>{party}@@ -181,7 +195,7 @@ function MessageListRow({className="h-4 w-4 rounded border-neutral-300"aria-label="Select message"/>- <Link href={href} onClick={navigation.onNavigate} className="contents">+ <Link href={href} onClick={onMessageNavigate} className="contents">{content}</Link>{(config.folder === "inbox" || config.folder === "snoozed") && message.direction === "inbound" && (@@ -222,10 +236,12 @@ export function MessageFolderPage({Array<{ id: string; read: boolean }>>([]);const [pendingBulkAction, setPendingBulkAction] = useState(false);- const { messages, isLoading, total, limit } = useMessages(config.folder, selectedMailbox?.id, {+ const [unreadOnly, setUnreadOnly] = useState(false);+ const { messages, isLoading, total, limit, updateMessages } = useMessages(config.folder, selectedMailbox?.id, {query,limit: pageSize,offset,+ read: unreadOnly ? "unread" : "all",}, !mailboxesLoading, config.folderId);const { counts } = useMessageCounts(selectedMailbox?.id, !mailboxesLoading);usePageLoading(mailboxesLoading || isLoading);@@ -252,7 +268,7 @@ export function MessageFolderPage({useEffect(() => {setOffset(0);setSelectedMessages([]);- }, [query, selectedMailbox?.id, config.folder, config.folderId]);+ }, [query, selectedMailbox?.id, config.folder, config.folderId, unreadOnly]);useEffect(() => {setSelectedMessages([]);@@ -298,9 +314,33 @@ export function MessageFolderPage({if (selectedIds.length === 0) return;setPendingBulkAction(true);+ const previousMessages = messages;+ const readValue = action === "read" ? true : action === "unread" ? false : null;+ const changedMessages = readValue === null+ ? []+ : messages.filter((message) => selectedIds.includes(message.id) && message.read !== readValue);+ if (readValue !== null) {+ updateMessages((current) => current.map((message) =>+ selectedIds.includes(message.id) ? { ...message, read: readValue } : message,+ ));+ setSelectedMessages((current) => current.map((message) => ({ ...message, read: readValue })));+ const inboxUnreadDelta = changedMessages+ .filter((message) => message.direction === "inbound")+ .reduce((total, message) => total + (readValue ? (message.read ? 0 : -1) : (message.read ? 1 : 0)), 0);+ if (inboxUnreadDelta) dispatchMessageCountsDelta({ inboxUnreadDelta });+ }try {await runBulkMessageAction(selectedIds, action);setSelectedMessages([]);+ } catch (error) {+ if (readValue !== null) {+ updateMessages(previousMessages);+ const inboxUnreadDelta = changedMessages+ .filter((message) => message.direction === "inbound")+ .reduce((total, message) => total + (readValue ? (message.read ? 0 : 1) : (message.read ? -1 : 0)), 0);+ if (inboxUnreadDelta) dispatchMessageCountsDelta({ inboxUnreadDelta });+ }+ throw error;} finally {setPendingBulkAction(false);}@@ -365,6 +405,21 @@ export function MessageFolderPage({<ChevronRight className="h-4 w-4" /></Button></Tooltip>+ {config.folder === "inbox" && (+ <Tooltip label={unreadOnly ? "Showing unread emails" : "Show unread emails only"}>+ <Button+ type="button"+ variant="ghost"+ size="sm"+ aria-label="Show unread emails only"+ aria-pressed={unreadOnly}+ onClick={() => setUnreadOnly((current) => !current)}+ className={unreadOnly ? "bg-blue-100 text-blue-700 hover:bg-blue-100" : undefined}+ >+ <ListFilter className="h-4 w-4" />+ </Button>+ </Tooltip>+ )}{!compact && headerIcons.map((Icon, index) => (<Icon key={index} className="h-4 w-4" />))}@@ -387,7 +442,6 @@ export function MessageFolderPage({dragMessageIds={selectedIds.includes(message.id) ? selectedIds : [message.id]}/>))}- {isLoading && <SkeletonRows count={7} compact={compact} />}{!isLoading && messages.length === 0 && (<p className="px-6 py-4 text-sm text-neutral-500">{hasActiveFilters ? "No messages match these filters" : config.emptyText}diff --git a/src/components/messages/message-navigation-types.d.ts b/src/components/messages/message-navigation-types.d.tsindex 0855ddf..315bef2 100644--- a/src/components/messages/message-navigation-types.d.ts+++ b/src/components/messages/message-navigation-types.d.ts@@ -2,5 +2,5 @@ import type { MouseEvent } from "react";export type MessageNavigationState = {progress: number | null;- onNavigate(event: MouseEvent<HTMLAnchorElement>): Promise<void>;+ onNavigate(event: MouseEvent<HTMLAnchorElement>, markRead?: boolean): void;};diff --git a/src/components/messages/message-navigation.tsx b/src/components/messages/message-navigation.tsxindex a74dd35..baa2b94 100644--- a/src/components/messages/message-navigation.tsx+++ b/src/components/messages/message-navigation.tsx@@ -3,11 +3,11 @@import { useEffect, useState } from "react";import { usePathname, useRouter } from "next/navigation";import type { MouseEvent } from "react";-import { waitForNavigationProgress } from "@/components/components-nav-utils";-import { fetchCachedMessageDetail } from "@/lib/messages/detail-cache";+import { primeMessageDetail } from "@/lib/messages/detail-cache";+import type { Message } from "@/hooks/types";import type { MessageNavigationState } from "./message-navigation-types";-export function useMessageNavigation(href: string, messageId: string): MessageNavigationState {+export function useMessageNavigation(href: string, message: Message): MessageNavigationState {const pathname = usePathname();const router = useRouter();const [progress, setProgress] = useState<number | null>(null);@@ -19,23 +19,15 @@ export function useMessageNavigation(href: string, messageId: string): MessageNareturn () => window.clearTimeout(timer);}, [pathname]);- async function onNavigate(event: MouseEvent<HTMLAnchorElement>) {+ function onNavigate(event: MouseEvent<HTMLAnchorElement>, markRead = false) {if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;event.preventDefault();+ primeMessageDetail({ ...message, read: markRead || message.read });setProgress(12);- const timer = window.setInterval(() => {- setProgress((current) => current === null ? 12 : Math.min(90, current + 8));- }, 80);try {- router.prefetch(href);- await Promise.all([fetchCachedMessageDetail(messageId), waitForNavigationProgress()]);- setProgress(100);- await waitForNavigationProgress(160);router.push(href);} catch {setProgress(null);- } finally {- window.clearInterval(timer);}}diff --git a/src/components/messages/utils.ts b/src/components/messages/utils.tsindex 3eb3311..4b4b0a1 100644--- a/src/components/messages/utils.ts+++ b/src/components/messages/utils.ts@@ -70,5 +70,5 @@ export async function runBulkMessageAction(messageIds: string[], action: string,});if (!response.ok) throw new Error("Unable to update selected messages");- window.dispatchEvent(new Event(notify ? "mailflare:messages-changed" : "mailflare:message-counts-changed"));+ if (notify) window.dispatchEvent(new Event("mailflare:messages-changed"));}diff --git a/src/components/settings/import-messages-types.d.ts b/src/components/settings/import-messages-types.d.tsindex cfe1f86..42f3ea3 100644--- a/src/components/settings/import-messages-types.d.ts+++ b/src/components/settings/import-messages-types.d.ts@@ -5,6 +5,8 @@ export type ImportMessagesResult = {error?: string;};+export type ImportProgressHandler = (percentage: number) => void;+export type ImportMessagesProps = {destination: string;sourceLabel: string;diff --git a/src/components/settings/import-messages-utils.ts b/src/components/settings/import-messages-utils.tsindex f53254c..257848e 100644--- a/src/components/settings/import-messages-utils.ts+++ b/src/components/settings/import-messages-utils.ts@@ -1,10 +1,11 @@-import { authFetch } from "@/lib/auth/client";-import type { ImportMessagesResult } from "./import-messages-types";+import { getAuthHeaders } from "@/lib/auth/client";+import type { ImportMessagesResult, ImportProgressHandler } from "./import-messages-types";export async function importMessageFiles(mailboxId: string,files: File[],destination: string,+ onProgress?: ImportProgressHandler,): Promise<ImportMessagesResult> {const form = new FormData();form.set("mailboxId", mailboxId);@@ -13,13 +14,25 @@ export async function importMessageFiles(form.append("files", file);}- const response = await authFetch("/api/import/messages", {- method: "POST",- body: form,+ return new Promise((resolve, reject) => {+ const request = new XMLHttpRequest();+ request.open("POST", "/api/import/messages");+ getAuthHeaders().forEach((value, key) => request.setRequestHeader(key, value));+ request.upload.onprogress = (event) => {+ if (event.lengthComputable) onProgress?.(Math.round((event.loaded / event.total) * 70));+ };+ request.onerror = () => reject(new Error("Import upload failed"));+ request.onload = () => {+ const data = JSON.parse(request.responseText || "{}") as ImportMessagesResult;+ if (request.status < 200 || request.status >= 300) {+ reject(new Error(data.error ?? "Import failed"));+ return;+ }+ onProgress?.(100);+ resolve(data);+ };+ request.send(form);});- const data = (await response.json()) as ImportMessagesResult;- if (!response.ok) throw new Error(data.error ?? "Import failed");- return data;}export function getImportSummary(result: ImportMessagesResult | null): string {diff --git a/src/components/sidebar-footer.tsx b/src/components/sidebar-footer.tsxindex 29ca9d9..41a6a7a 100644--- a/src/components/sidebar-footer.tsx+++ b/src/components/sidebar-footer.tsx@@ -7,7 +7,7 @@ export function SidebarFooter() {return (<p className="px-3 pt-3 text-xs text-neutral-400">Powered by{" "}- <a href={`https://mailflare.co/?ref=app&v=${packageJson.version}`} target="_blank">+ <a href={`https://mailflare.co/?ref=${location.hostname}&v=${packageJson.version}`} target="_blank">Mailflare v{packageJson.version}</a></p>diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsxindex fdf4cad..324ee31 100644--- a/src/components/ui/select.tsx+++ b/src/components/ui/select.tsx@@ -4,7 +4,7 @@ import type { SelectProps } from "./select-types";export const Select = React.forwardRef<HTMLSelectElement, SelectProps>(({ className, ...props }, ref) => (- <span className="rounded-lg border border-neutral-200 px-2">+ <span className="rounded-lg border border-neutral-200 px-2 inline-flex"><selectclassName={cn("flex w-full rounded-md bg-transparent focus-visible:border-blue-600 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50",diff --git a/src/db/schema/index.ts b/src/db/schema/index.tsindex 68b3db4..ea96166 100644--- a/src/db/schema/index.ts+++ b/src/db/schema/index.ts@@ -169,6 +169,9 @@ export const messages = sqliteTable(toAddr: text("to_addr").notNull(),subject: text("subject"),snippet: text("snippet"),+ textBody: text("text_body"),+ htmlBody: text("html_body"),+ rawR2Key: text("raw_r2_key"),status: text("status").notNull().default("received"),read: integer("read", { mode: "boolean" }).notNull().default(false),starred: integer("starred", { mode: "boolean" }).notNull().default(false),@@ -185,17 +188,6 @@ export const messages = sqliteTable(],);-export const messageBodies = sqliteTable("message_bodies", {- id: text("id").primaryKey(),- messageId: text("message_id")- .notNull()- .references(() => messages.id, { onDelete: "cascade" })- .unique(),- textBody: text("text_body"),- htmlBody: text("html_body"),- rawR2Key: text("raw_r2_key"),-});-export const messageAttachments = sqliteTable("message_attachments",{@@ -227,6 +219,7 @@ export const outboundJobs = sqliteTable("outbound_jobs", {status: text("status", { enum: ["queued", "sent", "failed"] }).notNull().default("queued"),payload: text("payload").notNull(),error: text("error"),+ scheduledAt: integer("scheduled_at", { mode: "timestamp" }),createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => new Date()),@@ -235,6 +228,38 @@ export const outboundJobs = sqliteTable("outbound_jobs", {.$defaultFn(() => new Date()),});+export const emailTemplates = sqliteTable(+ "email_templates",+ {+ id: text("id").primaryKey(),+ userId: text("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),+ name: text("name").notNull(),+ subject: text("subject").notNull().default(""),+ textBody: text("text_body").notNull().default(""),+ createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => new Date()),+ updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().$defaultFn(() => new Date()),+ },+ (t) => [index("email_templates_user_idx").on(t.userId)],+);++export const calendarEvents = sqliteTable(+ "calendar_events",+ {+ id: text("id").primaryKey(),+ userId: text("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),+ mailboxId: text("mailbox_id").references(() => mailboxes.id, { onDelete: "set null" }),+ title: text("title").notNull(),+ description: text("description").notNull().default(""),+ location: text("location").notNull().default(""),+ attendees: text("attendees").notNull().default("[]"),+ startsAt: integer("starts_at", { mode: "timestamp" }).notNull(),+ endsAt: integer("ends_at", { mode: "timestamp" }).notNull(),+ createdAt: integer("created_at", { mode: "timestamp" }).notNull().$defaultFn(() => new Date()),+ updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().$defaultFn(() => new Date()),+ },+ (t) => [index("calendar_events_user_starts_idx").on(t.userId, t.startsAt)],+);+export const routingRules = sqliteTable("routing_rules", {id: text("id").primaryKey(),userId: text("user_id")@@ -392,9 +417,10 @@ export const schema = {folders,apiKeys,messages,- messageBodies,messageAttachments,outboundJobs,+ emailTemplates,+ calendarEvents,routingRules,webhooks,webhookDeliveries,diff --git a/src/hooks/types.d.ts b/src/hooks/types.d.tsindex 8c2c5e7..669a528 100644--- a/src/hooks/types.d.ts+++ b/src/hooks/types.d.ts@@ -17,6 +17,8 @@ export type Message = {toContactName?: string | null;subject: string | null;snippet: string | null;+ textBody?: string | null;+ htmlBody?: string | null;status: MessageStatus | string;read: boolean;starred: boolean;diff --git a/src/hooks/use-messages.ts b/src/hooks/use-messages.tsindex 25556a1..928111e 100644--- a/src/hooks/use-messages.ts+++ b/src/hooks/use-messages.ts@@ -58,5 +58,5 @@ export function useMessages(};}, [enabled, filters?.limit, filters?.offset, filters?.query, filters?.read, filters?.title, folder, folderId, mailboxId]);- return { messages, unreadCount, isLoading, total, limit, offset };+ return { messages, unreadCount, isLoading, total, limit, offset, updateMessages: setMessages };}diff --git a/src/hooks/utils.ts b/src/hooks/utils.tsindex 4d39e21..5fc3d20 100644--- a/src/hooks/utils.ts+++ b/src/hooks/utils.ts@@ -59,7 +59,10 @@ export function getMessageQueryParams(if (folderId) params.set("folderId", folderId);if (mailboxId) params.set("mailboxId", mailboxId);- const parsedFilters = filters?.query ? { ...filters, ...parseMessageSearchQuery(filters.query) } : filters;+ const searchFilters = filters?.query ? parseMessageSearchQuery(filters.query) : null;+ const parsedFilters = searchFilters+ ? { ...filters, ...searchFilters, read: filters?.read ?? searchFilters.read }+ : filters;if (parsedFilters?.query?.trim()) params.set("q", parsedFilters.query.trim());if (parsedFilters?.title?.trim()) params.set("title", parsedFilters.title.trim());if (parsedFilters?.read && parsedFilters.read !== "all") params.set("read", parsedFilters.read);diff --git a/src/lib/backups/export.ts b/src/lib/backups/export.tsindex c6f537a..5998a26 100644--- a/src/lib/backups/export.ts+++ b/src/lib/backups/export.ts@@ -1,6 +1,7 @@import type { DatabaseBackupDocument, DatabaseBackupTable, DatabaseRecord } from "./types";+import { mergeLegacyMessageBodies } from "./utils";-const BACKUP_TABLES: DatabaseBackupTable[] = ["users", "domains", "mailboxes", "mailbox_access", "contacts", "folders", "api_keys", "messages", "message_bodies", "message_attachments", "outbound_jobs", "routing_rules", "webhooks", "webhook_deliveries", "sessions", "audit_logs", "backup_settings", "backups", "app_settings", "license_settings"];+const BACKUP_TABLES: DatabaseBackupTable[] = ["users", "domains", "mailboxes", "mailbox_access", "contacts", "folders", "api_keys", "messages", "message_attachments", "outbound_jobs", "routing_rules", "webhooks", "webhook_deliveries", "sessions", "audit_logs", "backup_settings", "backups", "app_settings", "license_settings"];const INSERT_BATCH_SIZE = 50;export function getD1ExportConfigurationStatus(_env?: CloudflareEnv) {@@ -19,6 +20,7 @@ export async function exportDatabaseRecords(db: D1Database): Promise<Uint8Array>export async function restoreDatabaseRecords(db: D1Database, content: ArrayBuffer): Promise<void> {const document = parseDatabaseBackup(content);+ mergeLegacyMessageBodies(document);validateDatabaseBackup(document);for (const table of [...BACKUP_TABLES].reverse()) await db.prepare(`DELETE FROM ${table}`).run();for (const table of BACKUP_TABLES) {diff --git a/src/lib/backups/types.d.ts b/src/lib/backups/types.d.tsindex 84f867e..eae5c9e 100644--- a/src/lib/backups/types.d.ts+++ b/src/lib/backups/types.d.ts@@ -12,6 +12,6 @@ export type BackupWorkflowBinding = {}): Promise<unknown>;};-export type DatabaseBackupTable = "users" | "domains" | "mailboxes" | "mailbox_access" | "contacts" | "folders" | "api_keys" | "messages" | "message_bodies" | "message_attachments" | "outbound_jobs" | "routing_rules" | "webhooks" | "webhook_deliveries" | "sessions" | "audit_logs" | "backup_settings" | "backups" | "app_settings" | "license_settings";+export type DatabaseBackupTable = "users" | "domains" | "mailboxes" | "mailbox_access" | "contacts" | "folders" | "api_keys" | "messages" | "message_attachments" | "outbound_jobs" | "routing_rules" | "webhooks" | "webhook_deliveries" | "sessions" | "audit_logs" | "backup_settings" | "backups" | "app_settings" | "license_settings";export type DatabaseRecord = Record<string, string | number | null>;export type DatabaseBackupDocument = { format: "mailflare-database-backup"; version: 1; createdAt: string; tables: Record<DatabaseBackupTable, DatabaseRecord[]>; };diff --git a/src/lib/backups/utils.ts b/src/lib/backups/utils.tsindex 1a52da0..ed5097e 100644--- a/src/lib/backups/utils.ts+++ b/src/lib/backups/utils.ts@@ -1,4 +1,4 @@-import type { BackupScheduleType, BackupWorkflowBinding } from "./types";+import type { BackupScheduleType, BackupWorkflowBinding, DatabaseBackupDocument, DatabaseRecord } from "./types";export const BACKUP_SETTINGS_ID = "default";export const BACKUP_PREFIX = "backups/database";@@ -38,3 +38,40 @@ export function getUtcDayBounds(now: Date): { start: number; end: number } {export function createBackupFilename(now: Date): string {return `mailflare-${now.toISOString().replace(/[:.]/g, "-")}.json`;}++/** Moves records from the pre-0019 body table into their message records. */+export function mergeLegacyMessageBodies(document: DatabaseBackupDocument): void {+ const tables = document.tables as Record<string, DatabaseRecord[]>;+ const bodyRows = tables.message_bodies;+ if (!bodyRows) return;++ const bodiesByMessageId = new Map<string, DatabaseRecord>();+ for (const body of bodyRows) {+ if (!isDatabaseRecord(body) || typeof body.message_id !== "string") {+ throw new Error("Backup contains an invalid message_bodies record");+ }+ bodiesByMessageId.set(body.message_id, body);+ }++ for (const message of tables.messages) {+ const body = bodiesByMessageId.get(message.id as string);+ if (!body) continue;+ copyMissingBodyField(message, body, "text_body");+ copyMissingBodyField(message, body, "html_body");+ copyMissingBodyField(message, body, "raw_r2_key");+ }++ delete tables.message_bodies;+}++function copyMissingBodyField(+ message: DatabaseRecord,+ body: DatabaseRecord,+ field: "text_body" | "html_body" | "raw_r2_key",+): void {+ if (!(field in message) && field in body) message[field] = body[field];+}++function isDatabaseRecord(value: unknown): value is DatabaseRecord {+ return !!value && typeof value === "object" && !Array.isArray(value);+}diff --git a/src/lib/calendar/utils.ts b/src/lib/calendar/utils.tsnew file mode 100644index 0000000..db69b05--- /dev/null+++ b/src/lib/calendar/utils.ts@@ -0,0 +1,22 @@+type CalendarInvitationInput = {+ title: string;+ description: string;+ location: string;+ startsAt: Date;+ endsAt: Date;+ uid: string;+ method?: "REQUEST" | "CANCEL";+};++function escapeCalendarText(value: string): string {+ return value.replace(/\\/g, "\\\\").replace(/;/g, "\\;").replace(/,/g, "\\,").replace(/\r?\n/g, "\\n");+}++function formatCalendarDate(value: Date): string {+ return value.toISOString().replace(/[-:]/g, "").replace(/\.\d{3}/, "");+}++export function createCalendarInvitation(input: CalendarInvitationInput): Uint8Array {+ const lines = ["BEGIN:VCALENDAR", "VERSION:2.0", "PRODID:-//Mailflare//Calendar//EN", "CALSCALE:GREGORIAN", `METHOD:${input.method ?? "REQUEST"}`, "BEGIN:VEVENT", `UID:${input.uid}@mailflare`, `DTSTAMP:${formatCalendarDate(new Date())}`, `DTSTART:${formatCalendarDate(input.startsAt)}`, `DTEND:${formatCalendarDate(input.endsAt)}`, `SUMMARY:${escapeCalendarText(input.title)}`, `DESCRIPTION:${escapeCalendarText(input.description)}`, `LOCATION:${escapeCalendarText(input.location)}`, "END:VEVENT", "END:VCALENDAR"];+ return new TextEncoder().encode(lines.join("\r\n"));+}diff --git a/src/lib/email/inbound.ts b/src/lib/email/inbound.tsindex 3bb4d4d..90b7e77 100644--- a/src/lib/email/inbound.ts+++ b/src/lib/email/inbound.ts@@ -1,6 +1,6 @@import { eq } from "drizzle-orm";import { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";import { newId } from "@/lib/ids";import { buildSnippet, parseRawMime } from "@/lib/email/parse";import { resolveInboundAddress, resolveInboxRuleDestination } from "@/lib/email/routing";@@ -85,17 +85,13 @@ export async function processInboundMessage(toAddr,subject: parsed.subject,snippet,- status: destination.status,- threadId: parsed.messageId,- });-- await db.insert(messageBodies).values({- id: newId(),- messageId,textBody: parsed.text,htmlBody: parsed.html,rawR2Key: payload.rawR2Key,+ status: destination.status,+ threadId: parsed.messageId,});+await storeMessageAttachments(env, messageId, parsed.attachments, { validate: false });} catch (error) {await db.delete(messages).where(eq(messages.id, messageId));@@ -146,15 +142,10 @@ export async function getMessageWithBody(env: CloudflareEnv, userId: string, mes.where(eq(messages.id, messageId)).limit(1);if (!message || message.userId !== userId) return null;- const [body] = await db- .select()- .from(messageBodies)- .where(eq(messageBodies.messageId, messageId))- .limit(1);const contactNames = await getMessageContactNames(env, userId, message.fromAddr, message.toAddr);const attachments = await listMessageAttachments(env, messageId);- const unsubscribeUrl = await getUnsubscribeUrlFromRawR2Key(env, body?.rawR2Key ?? null);- return { message: { ...message, ...contactNames }, body, attachments, unsubscribeUrl };+ const unsubscribeUrl = await getUnsubscribeUrlFromRawR2Key(env, message.rawR2Key);+ return { message: { ...message, ...contactNames }, body: message, attachments, unsubscribeUrl };}export async function getMessageWithBodyForUser(env: CloudflareEnv, user: SessionUser, messageId: string) {@@ -163,13 +154,25 @@ export async function getMessageWithBodyForUser(env: CloudflareEnv, user: Sessioif (!message?.mailboxId) return null;const access = await getMailboxAccessLevel(db, user, message.mailboxId);if (!access?.canRead) return null;- const [body] = await db- .select()- .from(messageBodies)- .where(eq(messageBodies.messageId, messageId))- .limit(1);const contactNames = await getMessageContactNames(env, message.userId, message.fromAddr, message.toAddr);const attachments = await listMessageAttachments(env, messageId);- const unsubscribeUrl = await getUnsubscribeUrlFromRawR2Key(env, body?.rawR2Key ?? null);- return { message: { ...message, ...contactNames }, body, attachments, unsubscribeUrl };+ const unsubscribeUrl = await getUnsubscribeUrlFromRawR2Key(env, message.rawR2Key);+ return { message: { ...message, ...contactNames }, body: message, attachments, unsubscribeUrl };+}++export async function getMessageMetadataForUser(env: CloudflareEnv, user: SessionUser, messageId: string) {+ 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 null;+ const access = await getMailboxAccessLevel(db, user, message.mailboxId);+ if (!access?.canRead) return null;+ const [attachments, unsubscribeUrl] = await Promise.all([+ listMessageAttachments(env, messageId),+ getUnsubscribeUrlFromRawR2Key(env, message.rawR2Key),+ ]);+ return { attachments, unsubscribeUrl };}diff --git a/src/lib/email/parse.ts b/src/lib/email/parse.tsindex e52549e..d5025e1 100644--- a/src/lib/email/parse.ts+++ b/src/lib/email/parse.ts@@ -37,6 +37,6 @@ export async function parseRawMime(raw: ArrayBuffer): Promise<ParsedEmail> {}export function buildSnippet(text: string | null, html: string | null, max = 200): string {- const source = getLatestEmailContent(text ?? htmlToReadableText(html));+ const source = getLatestEmailContent(text?.trim() || htmlToReadableText(html));return source.replace(/\s+/g, " ").trim().slice(0, max);}diff --git a/src/lib/email/reply-content-utils.ts b/src/lib/email/reply-content-utils.tsindex 8b6dd0f..4f88d48 100644--- a/src/lib/email/reply-content-utils.ts+++ b/src/lib/email/reply-content-utils.ts@@ -64,6 +64,7 @@ export function getLatestEmailContent(content: string | null | undefined): strinexport function htmlToReadableText(html: string | null | undefined): string {return (html ?? "")+ .replace(/<(style|script|head)\b[^>]*>[\s\S]*?<\/\1>/gi, " ").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|div|li|tr|blockquote|h[1-6])>/gi, "\n").replace(/<[^>]+>/g, " ")diff --git a/src/lib/email/send.ts b/src/lib/email/send.tsindex c03bc50..9bdf3e6 100644--- a/src/lib/email/send.ts+++ b/src/lib/email/send.ts@@ -1,6 +1,6 @@import { eq } from "drizzle-orm";import { getDb } from "@/db";-import { messageBodies, messages, outboundJobs } from "@/db/schema";+import { messages, outboundJobs } from "@/db/schema";import { newId } from "@/lib/ids";import { buildSnippet } from "@/lib/email/parse";import { dispatchWebhooks } from "@/lib/email/webhooks";@@ -43,14 +43,9 @@ export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): PromtoAddr: input.to,subject: input.subject,snippet,- status: "queued",- });-- await db.insert(messageBodies).values({- id: newId(),- messageId,textBody: input.text ?? null,htmlBody: input.html ?? null,+ status: "queued",});try {await storeMessageAttachments(env, messageId, attachments);diff --git a/src/lib/export/mbox.ts b/src/lib/export/mbox.tsindex 69e2c54..2c7998d 100644--- a/src/lib/export/mbox.ts+++ b/src/lib/export/mbox.ts@@ -1,6 +1,6 @@import { asc, eq } from "drizzle-orm";import { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";function escapeHeader(value: string | null): string {return (value ?? "").replace(/\r?\n/g, " ").trim();@@ -26,11 +26,10 @@ export async function exportMailboxToMbox(env: CloudflareEnv, mailboxId: string)direction: messages.direction,status: messages.status,createdAt: messages.createdAt,- textBody: messageBodies.textBody,- htmlBody: messageBodies.htmlBody,+ textBody: messages.textBody,+ htmlBody: messages.htmlBody,}).from(messages)- .leftJoin(messageBodies, eq(messageBodies.messageId, messages.id)).where(eq(messages.mailboxId, mailboxId)).orderBy(asc(messages.createdAt));diff --git a/src/lib/import/service.ts b/src/lib/import/service.tsindex bde21f3..6231bab 100644--- a/src/lib/import/service.ts+++ b/src/lib/import/service.ts@@ -1,6 +1,6 @@import { and, eq } from "drizzle-orm";import { getDb } from "@/db";-import { messageBodies, messages } from "@/db/schema";+import { messages } from "@/db/schema";import { storeMessageAttachments } from "@/lib/email/attachments";import { buildSnippet, parseRawMime } from "@/lib/email/parse";import { upsertContactFromAddress } from "@/lib/contacts/service";@@ -79,6 +79,8 @@ async function importMessageToMailbox(toAddr,subject: parsed.subject,snippet: buildSnippet(parsed.text, parsed.html),+ textBody: parsed.text,+ htmlBody: parsed.html,status: placement.status,read: placement.direction === "outbound",threadId: parsed.messageId,@@ -86,12 +88,6 @@ async function importMessageToMailbox(});try {- await db.insert(messageBodies).values({- id: newId(),- messageId,- textBody: parsed.text,- htmlBody: parsed.html,- });await storeMessageAttachments(env, messageId, parsed.attachments, { validate: false });const contactAddress = placement.direction === "outbound" ? toAddr : fromAddr;await upsertContactFromAddress(env, {diff --git a/src/lib/messages/detail-cache.ts b/src/lib/messages/detail-cache.tsindex a5922df..9aacbb0 100644--- a/src/lib/messages/detail-cache.ts+++ b/src/lib/messages/detail-cache.ts@@ -1,4 +1,5 @@import { authFetch } from "@/lib/auth/client";+import type { Message } from "@/hooks/types";import type { CachedMessageDetail } from "./detail-cache-types";const detailCache = new Map<string, CachedMessageDetail>();@@ -9,6 +10,18 @@ export function clearMessageDetailCache() {detailRequests.clear();}+export function getCachedMessageDetail(messageId: string): CachedMessageDetail | undefined {+ return detailCache.get(messageId);+}++export function primeMessageDetail(message: Message): void {+ if (message.textBody === undefined && message.htmlBody === undefined) return;+ detailCache.set(message.id, {+ message,+ body: { textBody: message.textBody ?? null, htmlBody: message.htmlBody ?? null },+ });+}+export async function fetchCachedMessageDetail(messageId: string, force = false): Promise<CachedMessageDetail> {if (!force && detailCache.has(messageId)) return detailCache.get(messageId) ?? {};if (!force && detailRequests.has(messageId)) return detailRequests.get(messageId) ?? {};diff --git a/src/lib/seed-utils.ts b/src/lib/seed-utils.tsindex 45c22e4..ca17e0b 100644--- a/src/lib/seed-utils.ts+++ b/src/lib/seed-utils.ts@@ -3,7 +3,6 @@ import { getDb } from "@/db";import {domains,mailboxes,- messageBodies,messages,outboundJobs,users,@@ -334,19 +333,14 @@ export async function insertDemoMessages(toAddr: seedMessage.toAddr,subject: seedMessage.subject,snippet: buildSnippet(seedMessage.textBody, null),+ textBody: seedMessage.textBody,+ htmlBody: null,status: seedMessage.status,read: seedMessage.read ?? true,threadId: seedMessage.providerMessageId ?? null,createdAt,});- await db.insert(messageBodies).values({- id: newId(),- messageId: id,- textBody: seedMessage.textBody,- htmlBody: null,- });-if (seedMessage.status === "queued" || seedMessage.status === "failed") {await db.insert(outboundJobs).values({id: newId("job"),diff --git a/src/lib/setup/migration.ts b/src/lib/setup/migration.tsindex f39c3e2..b5819e4 100644--- a/src/lib/setup/migration.ts+++ b/src/lib/setup/migration.ts@@ -17,6 +17,8 @@ const MIGRATION_NAMES = ["0016_add_message_snooze.sql","0017_add_message_star.sql","0018_add_mailbox_domain_aliases.sql",+ "0019_merge_message_bodies.sql",+ "0020_add_calendar_templates_schedule.sql",];const INITIAL_SCHEMA_SQL = `@@ -39,14 +41,17 @@ CREATE UNIQUE INDEX IF NOT EXISTS folders_mailbox_name_idx ON folders(mailbox_idCREATE INDEX IF NOT EXISTS folders_user_idx ON folders(user_id);CREATE INDEX IF NOT EXISTS folders_mailbox_idx ON folders(mailbox_id);CREATE TABLE IF NOT EXISTS api_keys (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, name text NOT NULL, prefix text NOT NULL, key_hash text NOT NULL, scopes text NOT NULL, created_at integer NOT NULL, last_used_at integer);-CREATE TABLE IF NOT EXISTS messages (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, mailbox_id text REFERENCES mailboxes(id) ON DELETE set null, direction text NOT NULL, provider_message_id text, folder_id text REFERENCES folders(id) ON DELETE set null, from_addr text NOT NULL, to_addr text NOT NULL, subject text, snippet text, status text DEFAULT 'received' NOT NULL, read integer DEFAULT false NOT NULL, starred integer DEFAULT false NOT NULL, snoozed_until integer, thread_id text, created_at integer NOT NULL);+CREATE TABLE IF NOT EXISTS messages (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, mailbox_id text REFERENCES mailboxes(id) ON DELETE set null, direction text NOT NULL, provider_message_id text, folder_id text REFERENCES folders(id) ON DELETE set null, from_addr text NOT NULL, to_addr text NOT NULL, subject text, snippet text, text_body text, html_body text, raw_r2_key text, status text DEFAULT 'received' NOT NULL, read integer DEFAULT false NOT NULL, starred integer DEFAULT false NOT NULL, snoozed_until integer, thread_id text, created_at integer NOT NULL);CREATE INDEX IF NOT EXISTS messages_user_created_idx ON messages(user_id, created_at);CREATE INDEX IF NOT EXISTS messages_mailbox_idx ON messages(mailbox_id);CREATE INDEX IF NOT EXISTS messages_folder_idx ON messages(folder_id);-CREATE TABLE IF NOT EXISTS message_bodies (id text PRIMARY KEY NOT NULL, message_id text NOT NULL UNIQUE REFERENCES messages(id) ON DELETE cascade, text_body text, html_body text, raw_r2_key text);CREATE TABLE IF NOT EXISTS message_attachments (id text PRIMARY KEY NOT NULL, message_id text NOT NULL REFERENCES messages(id) ON DELETE cascade, filename text NOT NULL, content_type text NOT NULL, size integer NOT NULL, disposition text DEFAULT 'attachment' NOT NULL, content_id text, r2_key text NOT NULL UNIQUE, created_at integer NOT NULL);CREATE INDEX IF NOT EXISTS message_attachments_message_idx ON message_attachments(message_id);-CREATE TABLE IF NOT EXISTS outbound_jobs (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, message_id text REFERENCES messages(id) ON DELETE set null, status text DEFAULT 'queued' NOT NULL, payload text NOT NULL, error text, created_at integer NOT NULL, updated_at integer NOT NULL);+CREATE TABLE IF NOT EXISTS outbound_jobs (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, message_id text REFERENCES messages(id) ON DELETE set null, status text DEFAULT 'queued' NOT NULL, payload text NOT NULL, error text, scheduled_at integer, created_at integer NOT NULL, updated_at integer NOT NULL);+CREATE TABLE IF NOT EXISTS email_templates (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, name text NOT NULL, subject text DEFAULT '' NOT NULL, text_body text DEFAULT '' NOT NULL, created_at integer NOT NULL, updated_at integer NOT NULL);+CREATE INDEX IF NOT EXISTS email_templates_user_idx ON email_templates(user_id);+CREATE TABLE IF NOT EXISTS calendar_events (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, mailbox_id text REFERENCES mailboxes(id) ON DELETE set null, title text NOT NULL, description text DEFAULT '' NOT NULL, location text DEFAULT '' NOT NULL, attendees text DEFAULT '[]' NOT NULL, starts_at integer NOT NULL, ends_at integer NOT NULL, created_at integer NOT NULL, updated_at integer NOT NULL);+CREATE INDEX IF NOT EXISTS calendar_events_user_starts_idx ON calendar_events(user_id, starts_at);CREATE TABLE IF NOT EXISTS routing_rules (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, domain_id text NOT NULL REFERENCES domains(id) ON DELETE cascade, pattern text NOT NULL, match_field text DEFAULT 'email' NOT NULL, match_operator text DEFAULT 'contains' NOT NULL, match_value text DEFAULT '' NOT NULL, mailbox_id text REFERENCES mailboxes(id) ON DELETE set null, folder_id text REFERENCES folders(id) ON DELETE set null, action text DEFAULT 'store' NOT NULL, forward_to text, priority integer DEFAULT 0 NOT NULL, created_at integer NOT NULL);CREATE TABLE IF NOT EXISTS webhooks (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, url text NOT NULL, secret text NOT NULL, events text NOT NULL, enabled integer DEFAULT true NOT NULL, created_at integer NOT NULL);CREATE TABLE IF NOT EXISTS webhook_deliveries (id text PRIMARY KEY NOT NULL, webhook_id text NOT NULL REFERENCES webhooks(id) ON DELETE cascade, event_type text NOT NULL, payload text NOT NULL, status text DEFAULT 'pending' NOT NULL, attempts integer DEFAULT 0 NOT NULL, created_at integer NOT NULL);