Skip to content

Email for professionals and teams

improve ui

Hieu Nguyen (Jack)1cb2b5cd4a43
diff --git a/drizzle/migrations/0026_add_contact_avatars.sql b/drizzle/migrations/0026_add_contact_avatars.sql
new file mode 100644
index 0000000..a92cd0d
--- /dev/null
+++ b/drizzle/migrations/0026_add_contact_avatars.sql
@@ -0,0 +1 @@
+ALTER TABLE `contacts` ADD `avatar_key` text;
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index e01418b..69d41ff 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -183,6 +183,13 @@
"when": 1788691200000,
"tag": "0025_add_threading_and_cc_bcc",
"breakpoints": true
+ },
+ {
+ "idx": 26,
+ "version": "6",
+ "when": 1788691200001,
+ "tag": "0026_add_contact_avatars",
+ "breakpoints": true
}
]
}
diff --git a/src/app/(dashboard)/inbox/[messageId]/page.tsx b/src/app/(dashboard)/inbox/[messageId]/page.tsx
index ffbcf4f..71b3470 100644
--- a/src/app/(dashboard)/inbox/[messageId]/page.tsx
+++ b/src/app/(dashboard)/inbox/[messageId]/page.tsx
@@ -15,6 +15,7 @@ import { MessageDetailSkeleton } from "@/components/page-skeletons";
import { usePageLoading } from "@/components/page-loading";
import { PreviousMessage } from "@/components/previous-message";
import { ConversationThread } from "@/components/messages/conversation-thread";
+import { ThreadMessageActions } from "@/components/messages/thread-message-actions";
import { useMessageThread } from "@/components/messages/use-message-thread";
import { getMessageBackHref } from "@/components/message-actions/utils";
import { getEmailAddress, getEmailDisplayName, splitEmailAddressList } from "@/lib/email/address";
@@ -39,6 +40,7 @@ export default function MessageDetailPage() {
const [loading, setLoading] = useState(true);
const [previewAttachment, setPreviewAttachment] =
useState<MessageAttachment | null>(null);
+ const [threadExpanded, setThreadExpanded] = useState(false);
usePageLoading(loading);
const thread = useMessageThread(messageId, data?.message?.threadId);
@@ -73,6 +75,10 @@ export default function MessageDetailPage() {
};
}, [messageId]);
+ useEffect(() => {
+ setThreadExpanded(false);
+ }, [messageId]);
+
if (loading) {
return <MessageDetailSkeleton />;
}
@@ -86,6 +92,12 @@ export default function MessageDetailPage() {
}
const { message, body, attachments = [] } = data;
+ const currentThreadMessage = {
+ ...message,
+ textBody: body?.textBody ?? null,
+ htmlBody: body?.htmlBody ?? null,
+ attachments,
+ };
const messageMailbox =
mailboxes.find((mailbox) => mailbox.id === message.mailboxId) ?? selectedMailbox;
const currentAccountName =
@@ -118,7 +130,6 @@ export default function MessageDetailPage() {
const cloudAttachmentResult = extractCloudAttachments(
bodyDisplay.latestContent,
);
-
return (
<div className="h-full overflow-y-auto overscroll-contain scrollbar-gutter-stable">
{message.direction === "inbound" && !message.read && (
@@ -151,18 +162,23 @@ export default function MessageDetailPage() {
bodyHtml={body?.htmlBody}
/>
</div>
+ <div className="px-6 pb-2 pt-4">
+ <h1 className="text-2xl text-neutral-900">
+ {message.subject ?? "(no subject)"}
+ </h1>
+ </div>
<ConversationThread
currentMessageId={message.id}
position="before"
messages={thread.messages}
mailboxId={message.mailboxId}
currentAccountName={currentAccountName}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ expandedAll={threadExpanded}
+ onExpandedAllChange={setThreadExpanded}
/>
<article className="px-6 py-4">
- <h1 className="text-2xl text-neutral-900 mb-4">
- {message.subject ?? "(no subject)"}
- </h1>
-
<div className="mb-6 flex items-start justify-between border-b border-neutral-100 pb-5">
<div>
<p className="text-sm text-neutral-900">
@@ -202,9 +218,17 @@ export default function MessageDetailPage() {
</p>
)}
</div>
- <p className="text-xs text-neutral-400">
- {dayjs(message.createdAt).format("MMM DD, YYYY, hh:mmA")}
- </p>
+ <div className="flex shrink-0 items-center gap-2">
+ <p className="text-xs">
+ {dayjs(message.createdAt).format("MMM DD, YYYY, hh:mmA")}
+ </p>
+ <ThreadMessageActions
+ message={currentThreadMessage}
+ mailboxId={message.mailboxId}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ />
+ </div>
</div>
<div className="prose max-w-none text-neutral-900">
{htmlBody ? (
@@ -286,6 +310,10 @@ export default function MessageDetailPage() {
messages={thread.messages}
mailboxId={message.mailboxId}
currentAccountName={currentAccountName}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ expandedAll={threadExpanded}
+ onExpandedAllChange={setThreadExpanded}
/>
<MessageAttachmentViewer
attachment={previewAttachment}
diff --git a/src/app/(settings)/settings/auto-reply/page.tsx b/src/app/(settings)/settings/auto-reply/page.tsx
index 560d646..4cfe12c 100644
--- a/src/app/(settings)/settings/auto-reply/page.tsx
+++ b/src/app/(settings)/settings/auto-reply/page.tsx
@@ -1,24 +1,5 @@
-import { MailboxAutoReplyForm } from "@/components/settings/mailbox-auto-reply-form";
+import { redirect } from "next/navigation";
export default function SettingsAutoReplyPage() {
- return (
- <div className="space-y-8 py-4">
- {/* <div>
- <h1 className="text-3xl font-medium text-neutral-900">Auto-reply</h1>
- <p className="mt-1 text-sm text-neutral-500">
- Automatically respond from the selected inbox when you are away or unavailable.
- </p>
- </div> */}
-
- <section className="space-y-4">
- <div>
- <h2 className="text-xl font-semibold text-neutral-900">Automatic response</h2>
- <p className="mt-1 text-sm text-neutral-500">Configure the subject and message for the inbox currently selected above.</p>
- </div>
- <div className="rounded-3xl bg-white p-6">
- <MailboxAutoReplyForm />
- </div>
- </section>
- </div>
- );
+ redirect("/settings/inbox");
}
diff --git a/src/app/(settings)/settings/inbox/page.tsx b/src/app/(settings)/settings/inbox/page.tsx
new file mode 100644
index 0000000..785cedf
--- /dev/null
+++ b/src/app/(settings)/settings/inbox/page.tsx
@@ -0,0 +1,30 @@
+import { InboxThreadingSettings } from "@/components/settings/inbox-threading-settings";
+import { MailboxAutoReplyForm } from "@/components/settings/mailbox-auto-reply-form";
+
+export default function SettingsInboxPage() {
+ return (
+ <div className="space-y-8 py-4">
+ <section className="space-y-4">
+ <div>
+ <h2 className="text-xl font-semibold text-neutral-900">Threading</h2>
+ <p className="mt-1 text-sm text-neutral-500">Choose how emails are organized in your inbox.</p>
+ </div>
+ <div className="rounded-3xl bg-white p-6">
+ <InboxThreadingSettings />
+ </div>
+ </section>
+
+ <section className="space-y-4">
+ <div>
+ <h2 className="text-xl font-semibold text-neutral-900">Automatic response</h2>
+ <p className="mt-1 text-sm text-neutral-500">
+ Configure the subject and message for the inbox currently selected above.
+ </p>
+ </div>
+ <div className="rounded-3xl bg-white p-6">
+ <MailboxAutoReplyForm />
+ </div>
+ </section>
+ </div>
+ );
+}
diff --git a/src/app/api/contacts/avatar/route.ts b/src/app/api/contacts/avatar/route.ts
new file mode 100644
index 0000000..a9a1d2c
--- /dev/null
+++ b/src/app/api/contacts/avatar/route.ts
@@ -0,0 +1,119 @@
+import { and, eq } from "drizzle-orm";
+import { NextResponse } from "next/server";
+import { getDb } from "@/db";
+import { contacts } from "@/db/schema";
+import { requireUser } from "@/lib/auth/cookies";
+import { getEnv } from "@/lib/cloudflare";
+import { getContactId } from "@/lib/contacts/utils";
+import { normalizeEmailAddress } from "@/lib/email/address";
+import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
+import {
+ ALLOWED_AVATAR_TYPES,
+ MAX_AVATAR_SIZE,
+ isUploadedAvatarFile,
+} from "@/app/api/profile/avatar/utils";
+import { contactAvatarKeyFor } from "./utils";
+
+export async function GET(request: Request) {
+ const env = getEnv();
+ const user = await requireUser(env, request);
+ const url = new URL(request.url);
+ const mailboxId = url.searchParams.get("mailboxId");
+ const email = normalizeEmailAddress(url.searchParams.get("address") ?? "");
+ if (!mailboxId || !email) return new Response("Not found", { status: 404 });
+
+ const db = getDb(env);
+ const access = await getMailboxAccessLevel(db, user, mailboxId);
+ if (!access?.canRead) return new Response("Not found", { status: 404 });
+ const [contact] = await db
+ .select({ avatarKey: contacts.avatarKey })
+ .from(contacts)
+ .where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)))
+ .limit(1);
+ if (!contact?.avatarKey) return new Response("Not found", { status: 404 });
+
+ const object = await env.BUCKET.get(contact.avatarKey);
+ if (!object) return new Response("Not found", { status: 404 });
+ const headers = new Headers();
+ headers.set("Content-Type", object.httpMetadata?.contentType ?? "application/octet-stream");
+ headers.set("X-Content-Type-Options", "nosniff");
+ headers.set("Content-Security-Policy", "default-src 'none'; img-src 'self'; sandbox");
+ headers.set("Cache-Control", "private, no-cache");
+ return new Response(object.body, { headers });
+}
+
+export async function POST(request: Request) {
+ const env = getEnv();
+ const user = await requireUser(env, request);
+ let form: FormData;
+ try {
+ form = await request.formData();
+ } catch {
+ return NextResponse.json({ error: "Expected multipart form data" }, { status: 400 });
+ }
+ const mailboxEntry = form.get("mailboxId");
+ const addressEntry = form.get("address");
+ const mailboxId = typeof mailboxEntry === "string" ? mailboxEntry : "";
+ const email = normalizeEmailAddress(typeof addressEntry === "string" ? addressEntry : "");
+ const file = form.get("file");
+ if (!mailboxId || !email || !isUploadedAvatarFile(file)) {
+ return NextResponse.json({ error: "Mailbox, contact, and image file are required" }, { status: 400 });
+ }
+ if (!ALLOWED_AVATAR_TYPES.includes(file.type)) {
+ return NextResponse.json({ error: "Use a JPEG, PNG, WebP, or GIF image" }, { status: 400 });
+ }
+ if (file.size > MAX_AVATAR_SIZE) {
+ return NextResponse.json({ error: "Image must be 2 MB or smaller" }, { status: 413 });
+ }
+
+ const db = getDb(env);
+ const access = await getMailboxAccessLevel(db, user, mailboxId);
+ if (!access?.canManage) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
+ const [existing] = await db
+ .select({ id: contacts.id })
+ .from(contacts)
+ .where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)))
+ .limit(1);
+ if (!existing) {
+ await db.insert(contacts).values({
+ id: getContactId(access.mailbox.userId, email),
+ userId: access.mailbox.userId,
+ email,
+ source: "manual",
+ });
+ }
+
+ const key = contactAvatarKeyFor(access.mailbox.userId, email);
+ await env.BUCKET.put(key, await file.arrayBuffer(), {
+ httpMetadata: { contentType: file.type },
+ });
+ await db
+ .update(contacts)
+ .set({ avatarKey: key })
+ .where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)));
+ return NextResponse.json({ ok: true });
+}
+
+export async function DELETE(request: Request) {
+ const env = getEnv();
+ const user = await requireUser(env, request);
+ const url = new URL(request.url);
+ const mailboxId = url.searchParams.get("mailboxId");
+ const email = normalizeEmailAddress(url.searchParams.get("address") ?? "");
+ if (!mailboxId || !email) return NextResponse.json({ error: "Mailbox and contact are required" }, { status: 400 });
+
+ const db = getDb(env);
+ const access = await getMailboxAccessLevel(db, user, mailboxId);
+ if (!access?.canManage) return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
+ const [contact] = await db
+ .select({ avatarKey: contacts.avatarKey })
+ .from(contacts)
+ .where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)))
+ .limit(1);
+ if (contact?.avatarKey) await env.BUCKET.delete(contact.avatarKey);
+ await db
+ .update(contacts)
+ .set({ avatarKey: null })
+ .where(and(eq(contacts.userId, access.mailbox.userId), eq(contacts.email, email)));
+ return NextResponse.json({ ok: true });
+}
diff --git a/src/app/api/contacts/avatar/utils.ts b/src/app/api/contacts/avatar/utils.ts
new file mode 100644
index 0000000..1436585
--- /dev/null
+++ b/src/app/api/contacts/avatar/utils.ts
@@ -0,0 +1,3 @@
+export function contactAvatarKeyFor(userId: string, email: string): string {
+ return `contact-avatars/${userId}/${encodeURIComponent(email.trim().toLowerCase())}`;
+}
diff --git a/src/app/api/contacts/route.ts b/src/app/api/contacts/route.ts
index 86f1a39..e917456 100644
--- a/src/app/api/contacts/route.ts
+++ b/src/app/api/contacts/route.ts
@@ -5,7 +5,7 @@ import { getEnv } from "@/lib/cloudflare";
import { normalizeEmailAddress } from "@/lib/email/address";
import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
import type { ContactRequestInput } from "./types";
-import { getContactByEmail, saveManualContactName } from "./utils";
+import { getContactByEmail, saveManualContactName, toContactDetails } from "./utils";
export async function GET(request: Request) {
const env = getEnv();
@@ -22,11 +22,12 @@ export async function GET(request: Request) {
if (!access?.canRead) {
return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
}
- const contact = await getContactByEmail(db, access.mailbox.userId, email);
+ const contact = toContactDetails(await getContactByEmail(db, access.mailbox.userId, email));
return NextResponse.json({
contact: contact ?? {
email,
displayName: null,
+ hasAvatar: false,
source: null,
blocked: false,
lastSeenAt: null,
@@ -49,10 +50,10 @@ export async function PATCH(request: Request) {
if (!access?.canManage) {
return NextResponse.json({ error: "Mailbox not found" }, { status: 404 });
}
- const contact = await saveManualContactName(db, {
+ const contact = toContactDetails(await saveManualContactName(db, {
userId: access.mailbox.userId,
email,
displayName,
- });
+ }));
return NextResponse.json({ contact });
}
diff --git a/src/app/api/contacts/utils.ts b/src/app/api/contacts/utils.ts
index 5216ac0..1598167 100644
--- a/src/app/api/contacts/utils.ts
+++ b/src/app/api/contacts/utils.ts
@@ -14,6 +14,12 @@ export async function getContactByEmail(db: Db, userId: string, email: string) {
return contact ?? null;
}
+export function toContactDetails(contact: Awaited<ReturnType<typeof getContactByEmail>>) {
+ if (!contact) return null;
+ const { avatarKey, ...details } = contact;
+ return { ...details, hasAvatar: !!avatarKey };
+}
+
export async function saveManualContactName(
db: Db,
input: { userId: string; email: string; displayName: string },
diff --git a/src/app/api/send/types.d.ts b/src/app/api/send/types.d.ts
index 4492e4e..055c299 100644
--- a/src/app/api/send/types.d.ts
+++ b/src/app/api/send/types.d.ts
@@ -15,4 +15,5 @@ export interface SendRequestPayload {
threadId?: string;
/** Draft whose stored attachments (e.g. forwarded files) should be sent along. */
draftId?: string;
+ scheduledAt?: string;
}
diff --git a/src/app/api/send/utils.ts b/src/app/api/send/utils.ts
index 41e63de..19f4f76 100644
--- a/src/app/api/send/utils.ts
+++ b/src/app/api/send/utils.ts
@@ -35,6 +35,7 @@ export async function parseSendRequest(request: Request): Promise<SendRequestPay
references: getOptionalFormValue(form, "references"),
threadId: getOptionalFormValue(form, "threadId"),
draftId: getOptionalFormValue(form, "draftId"),
+ scheduledAt: getOptionalFormValue(form, "scheduledAt"),
subject: String(form.get("subject") ?? ""),
text: getOptionalFormValue(form, "text"),
html: getOptionalFormValue(form, "html"),
diff --git a/src/components/compose/compose-form.tsx b/src/components/compose/compose-form.tsx
index c73cc2b..0f59317 100644
--- a/src/components/compose/compose-form.tsx
+++ b/src/components/compose/compose-form.tsx
@@ -1,11 +1,12 @@
"use client";
import { useEffect, useMemo, useRef, useState } from "react";
-import { FileText, Forward, Minimize2, Paperclip, Reply, Send, X } from "lucide-react";
+import { FileText, Forward, Minimize2, Paperclip, Reply, X } from "lucide-react";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Select } from "@/components/ui/select";
+import { Tooltip } from "@/components/ui/tooltip";
import { useSelectedMailbox } from "@/components/mailbox-provider";
import { authFetch } from "@/lib/auth/client";
import { formatEmailAddress, getEmailAddress } from "@/lib/email/address";
@@ -13,6 +14,8 @@ import { cn } from "@/lib/utils";
import { buildSendFormData, fetchDraft, formatAttachmentSize } from "./utils";
import { RecipientInput } from "./recipient-input";
import { RichTextEditor } from "./rich-text-editor";
+import { ScheduleSendMenu } from "./schedule-send-menu";
+import { formatScheduledSend } from "./schedule-send-utils";
import {
applyMailboxSignatureHtml,
hasMeaningfulHtml,
@@ -53,6 +56,7 @@ export function ComposeForm({
const [toast, setToast] = useState<Toast>(null);
const [loading, setLoading] = useState(false);
const [loadingDraft, setLoadingDraft] = useState(false);
+ const [scheduledAt, setScheduledAt] = useState<Date | null>(null);
const [loadedDraftMailboxId, setLoadedDraftMailboxId] = useState<string | null>(null);
const [loadedDraftFrom, setLoadedDraftFrom] = useState<string | null>(null);
const [selectedFrom, setSelectedFrom] = useState("");
@@ -232,9 +236,10 @@ export function ComposeForm({
mailboxId: selectedMailbox?.id,
threading: threading ?? undefined,
draftId: storedAttachments.length > 0 ? draftId : null,
+ scheduledAt,
}),
});
- const data = (await res.json()) as { messageId?: string; error?: string };
+ const data = (await res.json()) as { messageId?: string; scheduled?: boolean; error?: string };
setLoading(false);
if (!res.ok) {
@@ -259,7 +264,8 @@ export function ComposeForm({
setHtml(applyMailboxSignatureHtml("", "", selectedMailbox?.signature));
setQuotedHtml(null);
setAttachments([]);
- setToast({ type: "success", message: "Message sent" });
+ setScheduledAt(null);
+ setToast({ type: "success", message: data.scheduled ? "Message scheduled" : "Message sent" });
window.dispatchEvent(new Event("mailflare:messages-changed"));
}
@@ -352,16 +358,17 @@ export function ComposeForm({
</div>
)}
</div>
- <div className="border-b border-neutral-100 px-4 py-1">
- <Label htmlFor={`${mode}-from`} className="sr-only">From</Label>
+ <div className="border-b border-neutral-100 px-4 py-1 flex flex-row items-center">
+ <Label htmlFor={`${mode}-from`} className="text-sm text-neutral-500">From</Label>
<Select
id={`${mode}-from`}
value={selectedMailbox && selectedFrom ? `${selectedMailbox.id}|${selectedFrom}` : ""}
onChange={(event) => selectSender(event.target.value)}
- placeholder="Select a mailbox first"
+ // placeholder="Select a mailbox first"
required
disabled={loadingDraft || senderOptions.length === 0}
- className="h-8 border-0 px-0 py-1 text-sm shadow-none focus-visible:ring-0"
+ className="h-8 px-0 py-1 text-sm shadow-none focus-visible:ring-0"
+ containerClassName="border-0 flex-1"
>
{senderOptions.length === 0 && <option value="">Select a mailbox first</option>}
{senderOptions.map(({ mailbox, address }) => (
@@ -434,6 +441,52 @@ export function ComposeForm({
quotedHtml={quotedHtml}
disabled={loadingDraft}
placeholder="Write your message"
+ toolbarStart={
+ <>
+ <div className="flex items-center">
+ <Button
+ type="submit"
+ size="sm"
+ disabled={loading || loadingDraft || !fromAddr}
+ className="rounded-r-none px-4"
+ >
+ {loading ? "Sending" : scheduledAt ? "Schedule" : "Send"}
+ </Button>
+ <ScheduleSendMenu
+ disabled={loading || loadingDraft || !fromAddr}
+ value={scheduledAt}
+ onChange={setScheduledAt}
+ />
+ </div>
+ </>
+ }
+ toolbarEnd={
+ <>
+ {/* <span className="mx-1 h-5 w-px bg-neutral-200" /> */}
+ <Input
+ ref={attachmentInput}
+ type="file"
+ multiple
+ className="hidden"
+ onChange={(event) => addAttachments(event.target.files)}
+ />
+ <Tooltip label="Attach files">
+ <button
+ type="button"
+ aria-label="Attach files"
+ onClick={() => attachmentInput.current?.click()}
+ disabled={loading || loadingDraft}
+ className="rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900 disabled:pointer-events-none disabled:opacity-50"
+ >
+ <Paperclip className="h-4 w-4" />
+ </button>
+ </Tooltip>
+ <span className="flex-1" />
+ <p className="min-w-0 truncate text-xs text-neutral-500">
+ {scheduledAt ? `Sends ${formatScheduledSend(scheduledAt)}` : draftId ? "Saved to drafts" : "Autosaves as draft"}
+ </p>
+ </>
+ }
/>
{(attachments.length > 0 || storedAttachments.length > 0) && (
<div className="flex flex-wrap gap-2 border-t border-neutral-100 px-4 py-3">
@@ -482,31 +535,6 @@ export function ComposeForm({
))}
</div>
)}
- <div className="flex items-center gap-3 border-t border-neutral-100 px-4 py-3">
- <Input
- ref={attachmentInput}
- type="file"
- multiple
- className="hidden"
- onChange={(event) => addAttachments(event.target.files)}
- />
- <Button
- type="button"
- variant="ghost"
- size="sm"
- onClick={() => attachmentInput.current?.click()}
- disabled={loading || loadingDraft}
- >
- <Paperclip className="h-4 w-4" />
- Attach
- </Button>
- <span className="flex-1" />
- <p className="text-xs text-neutral-500">{draftId ? "Saved to drafts" : "Autosaves as draft"}</p>
- <Button type="submit" disabled={loading || loadingDraft || !fromAddr} className="rounded-full px-5">
- <Send className="h-4 w-4" />
- {loading ? "Sending" : "Send"}
- </Button>
- </div>
</form>
</>
);
diff --git a/src/components/compose/rich-text-editor-types.d.ts b/src/components/compose/rich-text-editor-types.d.ts
index fbf041e..227300a 100644
--- a/src/components/compose/rich-text-editor-types.d.ts
+++ b/src/components/compose/rich-text-editor-types.d.ts
@@ -8,6 +8,8 @@ export type RichTextEditorProps = {
disabled?: boolean;
placeholder?: string;
className?: string;
+ toolbarStart?: React.ReactNode;
+ toolbarEnd?: React.ReactNode;
};
export type ToolbarCommand = {
diff --git a/src/components/compose/rich-text-editor.tsx b/src/components/compose/rich-text-editor.tsx
index 98353b9..9404768 100644
--- a/src/components/compose/rich-text-editor.tsx
+++ b/src/components/compose/rich-text-editor.tsx
@@ -32,7 +32,17 @@ const COMMANDS: ToolbarCommand[] = [
* inline styles, lists, quotes and links, with pasted content flattened to
* text so a message never carries another site's markup.
*/
-export function RichTextEditor({ id, value, onChange, quotedHtml, disabled, placeholder, className }: RichTextEditorProps) {
+export function RichTextEditor({
+ id,
+ value,
+ onChange,
+ quotedHtml,
+ disabled,
+ placeholder,
+ className,
+ toolbarStart,
+ toolbarEnd,
+}: RichTextEditorProps) {
const editorRef = useRef<HTMLDivElement | null>(null);
const [active, setActive] = useState<Record<string, boolean>>({});
const [linkOpen, setLinkOpen] = useState(false);
@@ -159,7 +169,9 @@ export function RichTextEditor({ id, value, onChange, quotedHtml, disabled, plac
</div>
)}
</div>
- <div className="relative flex items-center gap-0.5 border-t border-neutral-100 px-2 py-1">
+ <div className="relative flex items-center gap-0.5 border-t border-neutral-100 px-4 py-3">
+ {toolbarStart}
+ {toolbarStart && <span className="mx-1 h-5 w-px bg-neutral-200" />}
{COMMANDS.map((item) => (
<Tooltip key={item.command} label={item.label}>
<button
@@ -202,6 +214,7 @@ export function RichTextEditor({ id, value, onChange, quotedHtml, disabled, plac
<RemoveFormatting className="h-4 w-4" />
</button>
</Tooltip>
+ {toolbarEnd}
{linkOpen && (
<form
className="absolute bottom-full left-2 z-10 mb-1 flex items-center gap-2 rounded-lg border border-neutral-200 bg-white p-2 shadow-lg"
diff --git a/src/components/compose/schedule-send-menu.tsx b/src/components/compose/schedule-send-menu.tsx
new file mode 100644
index 0000000..23384f2
--- /dev/null
+++ b/src/components/compose/schedule-send-menu.tsx
@@ -0,0 +1,72 @@
+"use client";
+
+import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
+import { Check, ChevronDown, X } from "lucide-react";
+import {
+ formatDateTimeLocal,
+ getScheduleSendOptions,
+ parseDateTimeLocal,
+} from "./schedule-send-utils";
+import type { ScheduleSendMenuProps } from "./schedule-send-types";
+
+export function ScheduleSendMenu({ disabled, value, onChange }: ScheduleSendMenuProps) {
+ const options = getScheduleSendOptions();
+ const minimum = new Date(Date.now() + 5 * 60 * 1000);
+
+ return (
+ <DropdownMenu.Root>
+ <DropdownMenu.Trigger
+ type="button"
+ disabled={disabled}
+ aria-label="Schedule send options"
+ className="inline-flex h-8 items-center justify-center rounded-r-lg border-l border-blue-500 bg-blue-600 px-2 text-white transition-colors hover:bg-blue-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50"
+ >
+ <ChevronDown className="h-4 w-4" />
+ </DropdownMenu.Trigger>
+ <DropdownMenu.Portal>
+ <DropdownMenu.Content
+ align="start"
+ sideOffset={6}
+ className="z-50 min-w-56 rounded-lg border border-neutral-200 bg-white p-1 text-sm shadow-lg"
+ >
+ {value && (
+ <>
+ <DropdownMenu.Item
+ onSelect={() => onChange(null)}
+ className="flex cursor-pointer items-center rounded-md px-3 py-2 outline-none hover:bg-neutral-100 focus:bg-neutral-100"
+ >
+ <X className="mr-2 h-4 w-4" />
+ Clear schedule
+ </DropdownMenu.Item>
+ <DropdownMenu.Separator className="my-1 h-px bg-neutral-100" />
+ </>
+ )}
+ {options.map((option) => (
+ <DropdownMenu.Item
+ key={option.label}
+ onSelect={() => onChange(option.value)}
+ className="cursor-pointer rounded-md px-3 py-2 outline-none hover:bg-neutral-100 focus:bg-neutral-100"
+ >
+ {option.label}
+ <span className="ml-2 text-xs text-neutral-400">
+ {option.value?.toLocaleTimeString([], { hour: "numeric", minute: "2-digit" })}
+ </span>
+ </DropdownMenu.Item>
+ ))}
+ <DropdownMenu.Separator className="my-1 h-px bg-neutral-100" />
+ <DropdownMenu.Label className="px-3 pb-1 pt-2 text-xs font-medium text-neutral-500">
+ Pick date &amp; time
+ </DropdownMenu.Label>
+ <input
+ type="datetime-local"
+ min={formatDateTimeLocal(minimum)}
+ value={value ? formatDateTimeLocal(value) : ""}
+ onChange={(event) => onChange(parseDateTimeLocal(event.target.value))}
+ onKeyDown={(event) => event.stopPropagation()}
+ className="mx-2 mb-2 h-9 rounded-md border border-neutral-200 px-2 text-sm outline-none focus:border-blue-400"
+ />
+ </DropdownMenu.Content>
+ </DropdownMenu.Portal>
+ </DropdownMenu.Root>
+ );
+}
diff --git a/src/components/compose/schedule-send-types.d.ts b/src/components/compose/schedule-send-types.d.ts
new file mode 100644
index 0000000..3baaedb
--- /dev/null
+++ b/src/components/compose/schedule-send-types.d.ts
@@ -0,0 +1,10 @@
+export type ScheduleSendOption = {
+ label: string;
+ value: Date | null;
+};
+
+export type ScheduleSendMenuProps = {
+ disabled?: boolean;
+ value: Date | null;
+ onChange: (value: Date | null) => void;
+};
diff --git a/src/components/compose/schedule-send-utils.ts b/src/components/compose/schedule-send-utils.ts
new file mode 100644
index 0000000..c289678
--- /dev/null
+++ b/src/components/compose/schedule-send-utils.ts
@@ -0,0 +1,42 @@
+import type { ScheduleSendOption } from "./schedule-send-types";
+
+function atTime(date: Date, hours: number): Date {
+ const result = new Date(date);
+ result.setHours(hours, 0, 0, 0);
+ return result;
+}
+
+export function getScheduleSendOptions(now = new Date()): ScheduleSendOption[] {
+ const laterToday = new Date(now.getTime() + 3 * 60 * 60 * 1000);
+ const tomorrow = new Date(now);
+ tomorrow.setDate(tomorrow.getDate() + 1);
+ const monday = new Date(now);
+ const daysUntilMonday = ((8 - monday.getDay()) % 7) || 7;
+ monday.setDate(monday.getDate() + daysUntilMonday);
+
+ return [
+ { label: "Later today", value: laterToday },
+ { label: "Tomorrow morning", value: atTime(tomorrow, 8) },
+ { label: "Monday morning", value: atTime(monday, 8) },
+ ];
+}
+
+export function formatScheduledSend(value: Date): string {
+ return new Intl.DateTimeFormat(undefined, {
+ weekday: "short",
+ month: "short",
+ day: "numeric",
+ hour: "numeric",
+ minute: "2-digit",
+ }).format(value);
+}
+
+export function formatDateTimeLocal(value: Date): string {
+ const offset = value.getTimezoneOffset() * 60 * 1000;
+ return new Date(value.getTime() - offset).toISOString().slice(0, 16);
+}
+
+export function parseDateTimeLocal(value: string): Date | null {
+ const date = new Date(value);
+ return Number.isNaN(date.getTime()) ? null : date;
+}
diff --git a/src/components/compose/utils.ts b/src/components/compose/utils.ts
index 7030c0b..eb0fbb5 100644
--- a/src/components/compose/utils.ts
+++ b/src/components/compose/utils.ts
@@ -25,6 +25,7 @@ export function buildSendFormData(input: {
threading?: ComposeThreading;
/** Draft whose stored attachments should be sent with the message. */
draftId?: string | null;
+ scheduledAt?: Date | null;
}): FormData {
const form = new FormData();
form.set("from", input.from);
@@ -39,6 +40,7 @@ export function buildSendFormData(input: {
if (input.threading?.references) form.set("references", input.threading.references);
if (input.threading?.threadId) form.set("threadId", input.threading.threadId);
if (input.draftId) form.set("draftId", input.draftId);
+ if (input.scheduledAt) form.set("scheduledAt", input.scheduledAt.toISOString());
for (const attachment of input.attachments) {
form.append("attachments", attachment.file);
}
diff --git a/src/components/contacts/contact-avatar-form-types.d.ts b/src/components/contacts/contact-avatar-form-types.d.ts
new file mode 100644
index 0000000..51d624a
--- /dev/null
+++ b/src/components/contacts/contact-avatar-form-types.d.ts
@@ -0,0 +1,7 @@
+export type ContactAvatarFormProps = {
+ mailboxId: string;
+ address: string;
+ name: string;
+ hasAvatar: boolean;
+ onAvatarChange: (hasAvatar: boolean) => void;
+};
diff --git a/src/components/contacts/contact-avatar-form-utils.ts b/src/components/contacts/contact-avatar-form-utils.ts
new file mode 100644
index 0000000..6c8db20
--- /dev/null
+++ b/src/components/contacts/contact-avatar-form-utils.ts
@@ -0,0 +1,31 @@
+import { authFetch } from "@/lib/auth/client";
+
+export const CONTACT_AVATAR_ACCEPT = "image/jpeg,image/png,image/webp,image/gif";
+const maxContactAvatarSize = 2 * 1024 * 1024;
+
+export function validateContactAvatar(file: File): string | null {
+ if (!CONTACT_AVATAR_ACCEPT.split(",").includes(file.type)) {
+ return "Use a JPEG, PNG, WebP, or GIF image";
+ }
+ if (file.size > maxContactAvatarSize) return "Image must be 2 MB or smaller";
+ return null;
+}
+
+export async function uploadContactAvatar(mailboxId: string, address: string, file: File): Promise<void> {
+ const body = new FormData();
+ body.append("mailboxId", mailboxId);
+ body.append("address", address);
+ body.append("file", file, file.name);
+ const response = await authFetch("/api/contacts/avatar", { method: "POST", body });
+ if (response.ok) return;
+ const data = (await response.json().catch(() => null)) as { error?: string } | null;
+ throw new Error(data?.error ?? "Upload failed");
+}
+
+export async function removeContactAvatar(mailboxId: string, address: string): Promise<void> {
+ const params = new URLSearchParams({ mailboxId, address });
+ const response = await authFetch(`/api/contacts/avatar?${params.toString()}`, { method: "DELETE" });
+ if (response.ok) return;
+ const data = (await response.json().catch(() => null)) as { error?: string } | null;
+ throw new Error(data?.error ?? "Unable to remove profile picture");
+}
diff --git a/src/components/contacts/contact-avatar-form.tsx b/src/components/contacts/contact-avatar-form.tsx
new file mode 100644
index 0000000..1b9836e
--- /dev/null
+++ b/src/components/contacts/contact-avatar-form.tsx
@@ -0,0 +1,100 @@
+"use client";
+
+import { useRef, useState } from "react";
+import { Camera, LoaderCircle } from "lucide-react";
+import { dispatchContactAvatarChanged } from "@/lib/contacts/avatar-client";
+import { normalizeEmailAddress } from "@/lib/email/address";
+import { Input } from "@/components/ui/input";
+import { ContactAvatar } from "./contact-avatar";
+import type { ContactAvatarFormProps } from "./contact-avatar-form-types";
+import {
+ CONTACT_AVATAR_ACCEPT,
+ removeContactAvatar,
+ uploadContactAvatar,
+ validateContactAvatar,
+} from "./contact-avatar-form-utils";
+
+export function ContactAvatarForm({
+ mailboxId,
+ address,
+ name,
+ hasAvatar,
+ onAvatarChange,
+}: ContactAvatarFormProps) {
+ const inputRef = useRef<HTMLInputElement>(null);
+ const [busy, setBusy] = useState(false);
+ const [status, setStatus] = useState<string | null>(null);
+
+ async function onPick(event: React.ChangeEvent<HTMLInputElement>) {
+ const file = event.target.files?.[0] ?? null;
+ event.target.value = "";
+ if (!file) return;
+ const validationError = validateContactAvatar(file);
+ if (validationError) {
+ setStatus(validationError);
+ return;
+ }
+
+ setBusy(true);
+ setStatus(null);
+ try {
+ await uploadContactAvatar(mailboxId, address, file);
+ onAvatarChange(true);
+ dispatchContactAvatarChanged({ email: normalizeEmailAddress(address), hasAvatar: true });
+ } catch (error) {
+ setStatus(error instanceof Error ? error.message : "Upload failed");
+ } finally {
+ setBusy(false);
+ }
+ }
+
+ async function onRemove() {
+ setBusy(true);
+ setStatus(null);
+ try {
+ await removeContactAvatar(mailboxId, address);
+ onAvatarChange(false);
+ dispatchContactAvatarChanged({ email: normalizeEmailAddress(address), hasAvatar: false });
+ } catch (error) {
+ setStatus(error instanceof Error ? error.message : "Unable to remove profile picture");
+ } finally {
+ setBusy(false);
+ }
+ }
+
+ return (
+ <div className="flex flex-col items-start gap-2">
+ <Input ref={inputRef} type="file" accept={CONTACT_AVATAR_ACCEPT} className="hidden" onChange={onPick} />
+ <div className="flex items-center gap-3">
+ <button
+ type="button"
+ onClick={() => inputRef.current?.click()}
+ disabled={busy}
+ className="group relative h-14 w-14 overflow-hidden rounded-full outline-none ring-blue-500 focus-visible:ring-2 focus-visible:ring-offset-2 disabled:cursor-wait"
+ aria-label={hasAvatar ? `Change ${name} profile picture` : `Upload ${name} profile picture`}
+ >
+ <ContactAvatar
+ mailboxId={mailboxId}
+ address={address}
+ name={name}
+ hasManagedAvatar={hasAvatar}
+ className="h-14 w-14 text-lg"
+ />
+ <span className="absolute inset-0 flex items-center justify-center bg-neutral-950/55 opacity-0 transition-opacity group-hover:opacity-100 group-focus-visible:opacity-100">
+ {busy ? <LoaderCircle className="h-5 w-5 animate-spin text-white" /> : <Camera className="h-5 w-5 text-white" />}
+ </span>
+ </button>
+ <div>
+ <p className="text-sm font-medium text-neutral-900">Profile picture</p>
+ <p className="text-xs text-neutral-500">Upload a contact photo to override Gravatar.</p>
+ {hasAvatar && (
+ <button type="button" onClick={() => void onRemove()} disabled={busy} className="mt-1 text-xs font-medium text-blue-600 hover:underline disabled:text-neutral-400">
+ Remove photo
+ </button>
+ )}
+ </div>
+ </div>
+ {status && <p className="text-xs text-red-600">{status}</p>}
+ </div>
+ );
+}
diff --git a/src/components/contacts/contact-avatar-types.d.ts b/src/components/contacts/contact-avatar-types.d.ts
new file mode 100644
index 0000000..d0fad7a
--- /dev/null
+++ b/src/components/contacts/contact-avatar-types.d.ts
@@ -0,0 +1,7 @@
+export type ContactAvatarProps = {
+ mailboxId: string | null;
+ address: string;
+ name: string;
+ hasManagedAvatar?: boolean;
+ className?: string;
+};
diff --git a/src/components/contacts/contact-avatar-utils.ts b/src/components/contacts/contact-avatar-utils.ts
new file mode 100644
index 0000000..bf0d3d7
--- /dev/null
+++ b/src/components/contacts/contact-avatar-utils.ts
@@ -0,0 +1,18 @@
+import { getEmailAddress } from "@/lib/email/address";
+
+export function getManagedContactAvatarUrl(mailboxId: string, address: string, version = 0): string {
+ const params = new URLSearchParams({ mailboxId, address: getEmailAddress(address) });
+ if (version) params.set("v", String(version));
+ return `/api/contacts/avatar?${params.toString()}`;
+}
+
+export async function getGravatarAvatarUrl(address: string): Promise<string> {
+ const email = getEmailAddress(address).trim().toLowerCase();
+ const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(email));
+ const hash = Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, "0")).join("");
+ return `https://gravatar.com/avatar/${hash}?d=404&r=g&s=96`;
+}
+
+export function getContactAvatarInitial(name: string, address: string): string {
+ return (name.trim() || getEmailAddress(address)).slice(0, 1).toUpperCase();
+}
diff --git a/src/components/contacts/contact-avatar.tsx b/src/components/contacts/contact-avatar.tsx
new file mode 100644
index 0000000..b2363ae
--- /dev/null
+++ b/src/components/contacts/contact-avatar.tsx
@@ -0,0 +1,84 @@
+"use client";
+
+import { useEffect, useState } from "react";
+import { CONTACT_AVATAR_CHANGED_EVENT } from "@/lib/contacts/avatar-client";
+import { normalizeEmailAddress } from "@/lib/email/address";
+import { cn } from "@/lib/utils";
+import type { ContactAvatarProps } from "./contact-avatar-types";
+import {
+ getContactAvatarInitial,
+ getGravatarAvatarUrl,
+ getManagedContactAvatarUrl,
+} from "./contact-avatar-utils";
+
+export function ContactAvatar({
+ mailboxId,
+ address,
+ name,
+ hasManagedAvatar = false,
+ className,
+}: ContactAvatarProps) {
+ const [managedAvatar, setManagedAvatar] = useState(hasManagedAvatar);
+ const [avatarUrl, setAvatarUrl] = useState<string | null>(null);
+ const [imageFailed, setImageFailed] = useState(false);
+ const [avatarVersion, setAvatarVersion] = useState(0);
+
+ useEffect(() => {
+ setManagedAvatar(hasManagedAvatar);
+ setAvatarUrl(null);
+ setImageFailed(false);
+ setAvatarVersion(0);
+ }, [address, hasManagedAvatar, mailboxId]);
+
+ useEffect(() => {
+ function onAvatarChanged(event: Event) {
+ const detail = (event as CustomEvent<{ email?: string; hasAvatar?: boolean }>).detail;
+ if (detail?.email === normalizeEmailAddress(address)) {
+ setManagedAvatar(!!detail.hasAvatar);
+ setAvatarVersion(Date.now());
+ }
+ }
+
+ window.addEventListener(CONTACT_AVATAR_CHANGED_EVENT, onAvatarChanged);
+ return () => window.removeEventListener(CONTACT_AVATAR_CHANGED_EVENT, onAvatarChanged);
+ }, [address]);
+
+ useEffect(() => {
+ let cancelled = false;
+ setImageFailed(false);
+ if (managedAvatar && mailboxId) {
+ setAvatarUrl(getManagedContactAvatarUrl(mailboxId, address, avatarVersion));
+ return;
+ }
+ void getGravatarAvatarUrl(address).then((url) => {
+ if (!cancelled) setAvatarUrl(url);
+ });
+ return () => {
+ cancelled = true;
+ };
+ }, [address, avatarVersion, mailboxId, managedAvatar]);
+
+ if (avatarUrl && !imageFailed) {
+ return (
+ // eslint-disable-next-line @next/next/no-img-element
+ <img
+ src={avatarUrl}
+ alt=""
+ className={cn("h-8 w-8 shrink-0 rounded-full border border-neutral-200 object-cover", className)}
+ onError={() => {
+ if (managedAvatar) setManagedAvatar(false);
+ else setImageFailed(true);
+ }}
+ />
+ );
+ }
+
+ return (
+ <span
+ className={cn("flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-neutral-200 text-sm font-semibold text-neutral-700", className)}
+ aria-hidden
+ >
+ {getContactAvatarInitial(name, address)}
+ </span>
+ );
+}
diff --git a/src/components/contacts/contact-details-types.d.ts b/src/components/contacts/contact-details-types.d.ts
index eca4f9c..ac32863 100644
--- a/src/components/contacts/contact-details-types.d.ts
+++ b/src/components/contacts/contact-details-types.d.ts
@@ -1,6 +1,7 @@
export type ContactDetailsRecord = {
email: string;
displayName: string | null;
+ hasAvatar: boolean;
source: "manual" | "inbound" | "outbound" | null;
blocked: boolean;
lastSeenAt: string | null;
diff --git a/src/components/contacts/contact-details.tsx b/src/components/contacts/contact-details.tsx
index ae984ca..5c31ffa 100644
--- a/src/components/contacts/contact-details.tsx
+++ b/src/components/contacts/contact-details.tsx
@@ -11,11 +11,11 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
+import { ContactAvatarForm } from "./contact-avatar-form";
import { Label } from "@/components/ui/label";
import type { ContactDetailsRecord, ContactDetailsTriggerProps } from "./contact-details-types";
import {
fetchContactDetails,
- getContactInitial,
updateContactName,
} from "./contact-details-utils";
@@ -98,9 +98,13 @@ export function ContactDetailsTrigger({
</DialogHeader>
<div className="space-y-5">
<div className="flex items-center gap-4">
- <div className="flex h-14 w-14 shrink-0 items-center justify-center rounded-full bg-blue-100 text-lg font-semibold text-blue-700">
- {getContactInitial(shownName, address)}
- </div>
+ <ContactAvatarForm
+ mailboxId={mailboxId}
+ address={address}
+ name={shownName}
+ hasAvatar={contact?.hasAvatar ?? false}
+ onAvatarChange={(hasAvatar) => setContact((current) => current ? { ...current, hasAvatar } : current)}
+ />
<div className="min-w-0">
<p className="truncate font-medium text-neutral-900">{shownName}</p>
<p className="truncate text-sm text-neutral-500">{contact?.email ?? address}</p>
diff --git a/src/components/messages/conversation-thread-types.d.ts b/src/components/messages/conversation-thread-types.d.ts
index 2808620..d9035c4 100644
--- a/src/components/messages/conversation-thread-types.d.ts
+++ b/src/components/messages/conversation-thread-types.d.ts
@@ -8,12 +8,18 @@ export type ConversationThreadProps = {
messages: ThreadMessage[];
mailboxId: string | null;
currentAccountName?: string;
+ ownAddress?: string | null;
+ ownAddresses?: string[];
+ expandedAll: boolean;
+ onExpandedAllChange: (expanded: boolean) => void;
};
export type ConversationMessageCardProps = {
message: ThreadMessage;
mailboxId: string | null;
currentAccountName?: string;
+ ownAddress?: string | null;
+ ownAddresses?: string[];
defaultExpanded?: boolean;
};
diff --git a/src/components/messages/conversation-thread.tsx b/src/components/messages/conversation-thread.tsx
index e9fb16c..09b3407 100644
--- a/src/components/messages/conversation-thread.tsx
+++ b/src/components/messages/conversation-thread.tsx
@@ -3,25 +3,25 @@
import Link from "next/link";
import { useState } from "react";
import dayjs from "dayjs";
-import { ChevronDown, Paperclip, Reply } from "lucide-react";
+import { ChevronsUpDown, Paperclip } from "lucide-react";
import { ContactDetailsTrigger } from "@/components/contacts/contact-details";
+import { ContactAvatar } from "@/components/contacts/contact-avatar";
import { getMessageBackHref } from "@/components/message-actions/utils";
import { sanitizeEmailHtml } from "@/app/(dashboard)/inbox/[messageId]/email-html-sanitizer";
import { getMessageBodyDisplay, resolveInlineAttachmentUrls } from "@/app/(dashboard)/inbox/[messageId]/utils";
import { getEmailAddress } from "@/lib/email/address";
import { cn } from "@/lib/utils";
import type { ConversationMessageCardProps, ConversationThreadProps } from "./conversation-thread-types";
+import { ThreadMessageActions } from "./thread-message-actions";
import {
- getAvatarInitial,
getConversationRecipients,
getConversationSender,
partitionThread,
} from "./conversation-thread-utils";
/**
- * The other messages in a conversation, collapsed to one line each and expanded
- * in place on click, so a reader can follow a whole exchange without leaving the
- * message they opened.
+ * The other messages in a conversation, ordered oldest to newest and collapsed
+ * until opened. Readers can also expand the full visible portion at once.
*/
export function ConversationThread({
currentMessageId,
@@ -29,30 +29,73 @@ export function ConversationThread({
messages,
mailboxId,
currentAccountName,
+ ownAddress,
+ ownAddresses,
+ expandedAll,
+ onExpandedAllChange,
}: ConversationThreadProps) {
const slice = partitionThread(messages, currentMessageId, position);
if (slice.length === 0) return null;
+ const firstMessage = slice[0];
+ const lastMessage = slice.at(-1)!;
+ const middleMessages = slice.slice(1, -1);
+ const collapsed = !expandedAll && middleMessages.length > 0;
+ const collapsedLabel = `${middleMessages.length} ${position === "before" ? "older" : "newer"} message${middleMessages.length === 1 ? "" : "s"}`;
return (
<section
aria-label={position === "before" ? "Earlier messages in this conversation" : "Later messages in this conversation"}
- className={cn("px-6", position === "before" ? "pt-4" : "pb-6")}
+ className={cn(position === "before" ? "" : "pb-6")}
>
- {position === "before" && (
- <p className="mb-2 text-xs font-medium uppercase tracking-wide text-neutral-400">
- Conversation · {messages.length} messages
- </p>
- )}
- <ol className="space-y-2">
- {slice.map((message) => (
- <li key={message.id}>
+ <ol className={cn(!collapsed && "divide-y divide-neutral-100", "border-b border-neutral-200")}>
+ <li className="border-t-0">
+ <ConversationMessageCard
+ message={firstMessage}
+ mailboxId={mailboxId}
+ currentAccountName={currentAccountName}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ />
+ </li>
+ {collapsed ? (
+ <li className="flex items-center justify-center gap-1 py-2 text-center border-y border-neutral-100 h-px my-4">
+ <span className="bg-white px-6 flex flex-row items-center gap-2">
+ <span className="text-sm font-medium text-neutral-600">{collapsedLabel}</span>
+ <button
+ type="button"
+ onClick={() => onExpandedAllChange(true)}
+ aria-label={`Expand ${collapsedLabel}`}
+ title={`Expand ${collapsedLabel}`}
+ className="inline-flex h-6 w-6 items-center justify-center rounded-full text-neutral-500 hover:bg-neutral-100 hover:text-neutral-900"
+ >
+ <ChevronsUpDown className="h-4 w-4" />
+ </button>
+ </span>
+ </li>
+ ) : (
+ middleMessages.map((message) => (
+ <li key={message.id}>
+ <ConversationMessageCard
+ message={message}
+ mailboxId={mailboxId}
+ currentAccountName={currentAccountName}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ />
+ </li>
+ ))
+ )}
+ {lastMessage.id !== firstMessage.id && (
+ <li>
<ConversationMessageCard
- message={message}
+ message={lastMessage}
mailboxId={mailboxId}
currentAccountName={currentAccountName}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
/>
</li>
- ))}
+ )}
</ol>
</section>
);
@@ -62,9 +105,12 @@ export function ConversationMessageCard({
message,
mailboxId,
currentAccountName,
+ ownAddress,
+ ownAddresses,
defaultExpanded = false,
}: ConversationMessageCardProps) {
- const [expanded, setExpanded] = useState(defaultExpanded);
+ const [locallyExpanded, setLocallyExpanded] = useState(defaultExpanded);
+ const expanded = locallyExpanded;
const sender = getConversationSender(message, currentAccountName);
const recipients = getConversationRecipients(message);
const href = `${getMessageBackHref(message.direction, message.status)}/${message.id}`;
@@ -81,55 +127,53 @@ export function ConversationMessageCard({
}
return (
- <article
- className={cn(
- "rounded-lg border transition-colors",
- outbound ? "border-blue-100 bg-blue-50/40" : "border-neutral-200 bg-white",
- expanded ? "shadow-sm" : "hover:bg-neutral-50",
- )}
- >
- <button
- type="button"
- onClick={() => setExpanded((open) => !open)}
- aria-expanded={expanded}
- className="flex w-full items-center gap-3 px-4 py-3 text-left"
- >
- <span
- className={cn(
- "flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-sm font-semibold",
- outbound ? "bg-blue-600 text-white" : "bg-neutral-200 text-neutral-700",
- )}
- aria-hidden
+ <article className={cn("bg-white transition-colors px-6", !expanded && "hover:bg-neutral-50")}>
+ <div className="flex w-full items-center gap-3 py-3">
+ <button
+ type="button"
+ onClick={() => setLocallyExpanded((open) => !open)}
+ aria-expanded={expanded}
+ className="flex min-w-0 flex-1 items-center gap-3 text-left cursor-pointer"
>
- {outbound ? <Reply className="h-4 w-4" /> : getAvatarInitial(message, currentAccountName)}
- </span>
- <span className="min-w-0 flex-1">
- <span className="flex items-baseline justify-between gap-3">
- <span className={cn("truncate text-sm", message.read || outbound ? "text-neutral-900" : "font-semibold text-neutral-900")}>
- {sender}
- {recipients && <span className="ml-2 text-xs font-normal text-neutral-500">to {recipients}</span>}
- </span>
- <span className="flex shrink-0 items-center gap-2 text-xs text-neutral-400">
- {attachments.length > 0 && <Paperclip className="h-3.5 w-3.5" aria-label={`${attachments.length} attachments`} />}
- {dayjs(message.createdAt).format("MMM DD, YYYY, hh:mmA")}
- <ChevronDown className={cn("h-4 w-4 transition-transform", expanded && "rotate-180")} />
- </span>
+ <ContactAvatar
+ mailboxId={mailboxId}
+ address={message.fromAddr}
+ name={sender}
+ hasManagedAvatar={message.fromContactHasAvatar}
+ />
+ <span className="min-w-0 flex-1">
+ <div className="flex flex-col">
+ <span className={cn("truncate text-sm", message.read || outbound ? "text-neutral-900" : "font-semibold text-neutral-900")}>
+ {sender}
+ </span>
+ {expanded && recipients && <span className="text-xs font-normal text-neutral-500">to {recipients}</span>}
+ </div>
+ {!expanded && (
+ <span className="block truncate text-xs text-neutral-500">{message.snippet || "No preview"}</span>
+ )}
</span>
- {!expanded && (
- <span className="mt-0.5 block truncate text-xs text-neutral-500">{message.snippet || "No preview"}</span>
- )}
+ </button>
+ <span className="flex shrink-0 items-center gap-2 text-xs">
+ {attachments.length > 0 && <Paperclip className="h-3.5 w-3.5" aria-label={`${attachments.length} attachments`} />}
+ {dayjs(message.createdAt).format("MMM DD, YYYY, hh:mmA")}
</span>
- </button>
+ <ThreadMessageActions
+ message={message}
+ mailboxId={mailboxId}
+ ownAddress={ownAddress}
+ ownAddresses={ownAddresses}
+ />
+ </div>
{expanded && body && (
- <div className="border-t border-neutral-100 px-4 py-4">
- <p className="mb-3 text-xs text-neutral-500">
+ <div className="pb-4 pt-2">
+ {/* <p className="mb-3 text-xs text-neutral-500">
{message.direction === "inbound" ? (
<ContactDetailsTrigger mailboxId={mailboxId} address={message.fromAddr} name={sender} />
) : (
sender
)}{" "}
&lt;{getEmailAddress(message.fromAddr)}&gt;
- </p>
+ </p> */}
{body.html ? (
<div className="email-body max-w-none text-sm text-neutral-900" dangerouslySetInnerHTML={{ __html: body.html }} />
) : (
@@ -150,9 +194,6 @@ export function ConversationMessageCard({
))}
</ul>
)}
- <Link href={href} className="mt-4 inline-block text-xs font-medium text-blue-600 hover:underline">
- Open this message
- </Link>
</div>
)}
</article>
diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsx
index bd89da6..dab27a5 100644
--- a/src/components/messages/message-folder-page.tsx
+++ b/src/components/messages/message-folder-page.tsx
@@ -3,7 +3,7 @@
import Link from "next/link";
import { useEffect, useMemo, useState } from "react";
import type { MouseEvent } from "react";
-import { ChevronLeft, ChevronRight, ListFilter, MessagesSquare } from "lucide-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";
@@ -246,7 +246,7 @@ export function MessageFolderPage({
>([]);
const [pendingBulkAction, setPendingBulkAction] = useState(false);
const [unreadOnly, setUnreadOnly] = useState(false);
- const [conversationView, setConversationView] = useConversationView();
+ const [conversationView] = useConversationView();
const grouped = conversationView && config.folder !== "drafts";
const { messages, isLoading, total, limit, updateMessages } = useMessages(config.folder, selectedMailbox?.id, {
query,
@@ -422,21 +422,6 @@ export function MessageFolderPage({
<ChevronRight className="h-4 w-4" />
</Button>
</Tooltip>
- {config.folder !== "drafts" && (
- <Tooltip label={conversationView ? "Conversation view on" : "Conversation view off"}>
- <Button
- type="button"
- variant="ghost"
- size="sm"
- aria-label="Toggle conversation view"
- aria-pressed={conversationView}
- onClick={() => setConversationView(!conversationView)}
- className={conversationView ? "bg-blue-100 text-blue-700 hover:bg-blue-100" : undefined}
- >
- <MessagesSquare className="h-4 w-4" />
- </Button>
- </Tooltip>
- )}
{config.folder === "inbox" && (
<Tooltip label={unreadOnly ? "Showing unread emails" : "Show unread emails only"}>
<Button
diff --git a/src/components/messages/thread-message-actions-types.d.ts b/src/components/messages/thread-message-actions-types.d.ts
new file mode 100644
index 0000000..dcac731
--- /dev/null
+++ b/src/components/messages/thread-message-actions-types.d.ts
@@ -0,0 +1,8 @@
+import type { ThreadMessage } from "@/hooks/types";
+
+export type ThreadMessageActionsProps = {
+ message: ThreadMessage;
+ mailboxId: string | null;
+ ownAddress?: string | null;
+ ownAddresses?: string[];
+};
diff --git a/src/components/messages/thread-message-actions.tsx b/src/components/messages/thread-message-actions.tsx
new file mode 100644
index 0000000..fbfb2f3
--- /dev/null
+++ b/src/components/messages/thread-message-actions.tsx
@@ -0,0 +1,207 @@
+"use client";
+
+import { createElement, useEffect, useState } from "react";
+import { Ban, Forward, Mail, MailOpen, MoreVertical, Reply, ReplyAll, Star } from "lucide-react";
+import { useCompose } from "@/components/compose/compose-context";
+import { getOwnAddressForMessage } from "@/app/(dashboard)/inbox/[messageId]/utils";
+import { Button } from "@/components/ui/button";
+import { Tooltip } from "@/components/ui/tooltip";
+import {
+ blockMessageContact,
+ createForwardDraft,
+ createReplyDraft,
+ getMoveMessageActions,
+ getReplyRecipients,
+ getReplyThreading,
+ hasAdditionalRecipients,
+ runSingleMessageAction,
+} from "@/components/message-actions/utils";
+import { toggleMessageStar } from "./message-list-row-actions-utils";
+import type { ThreadMessageActionsProps } from "./thread-message-actions-types";
+import type { ReplyMode } from "@/components/message-actions/types";
+
+export function ThreadMessageActions({
+ message,
+ mailboxId,
+ ownAddress,
+ ownAddresses = [],
+}: ThreadMessageActionsProps) {
+ const { openDraftComposer } = useCompose();
+ const [starred, setStarred] = useState(message.starred);
+ const [moreOpen, setMoreOpen] = useState(false);
+ const [pending, setPending] = useState(false);
+ const [error, setError] = useState<string | null>(null);
+ const canReplyAll = hasAdditionalRecipients(message, ownAddresses);
+ const moveActions = getMoveMessageActions(message.status, message.direction);
+ const replyFromAddress = ownAddresses.length > 0
+ ? getOwnAddressForMessage(message, ownAddresses)
+ : ownAddress;
+
+ useEffect(() => setStarred(message.starred), [message.starred]);
+
+ async function onToggleStar() {
+ setPending(true);
+ setError(null);
+ try {
+ setStarred(await toggleMessageStar(message.id));
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Unable to update star");
+ } finally {
+ setPending(false);
+ }
+ }
+
+ async function onReply(mode: ReplyMode) {
+ setMoreOpen(false);
+ setPending(true);
+ setError(null);
+ try {
+ const draftId = await createReplyDraft({
+ mailboxId,
+ senderAddress: message.fromAddr,
+ ownAddress: replyFromAddress,
+ subject: message.subject,
+ bodyText: message.textBody,
+ bodyHtml: message.htmlBody,
+ sentAt: message.createdAt,
+ recipients: getReplyRecipients(message, ownAddresses, mode),
+ threading: getReplyThreading(message),
+ });
+ openDraftComposer(draftId);
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Could not start reply");
+ } finally {
+ setPending(false);
+ }
+ }
+
+ async function onForward() {
+ setMoreOpen(false);
+ setPending(true);
+ setError(null);
+ try {
+ const draftId = await createForwardDraft({
+ mailboxId,
+ ownAddress: replyFromAddress,
+ message,
+ bodyText: message.textBody,
+ bodyHtml: message.htmlBody,
+ });
+ openDraftComposer(draftId);
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Could not start forward");
+ } finally {
+ setPending(false);
+ }
+ }
+
+ async function onMessageAction(action: Parameters<typeof runSingleMessageAction>[1]) {
+ setMoreOpen(false);
+ setPending(true);
+ setError(null);
+ try {
+ await runSingleMessageAction(message.id, action);
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Could not update message");
+ } finally {
+ setPending(false);
+ }
+ }
+
+ async function onBlock() {
+ if (!mailboxId) return;
+ setMoreOpen(false);
+ setPending(true);
+ setError(null);
+ try {
+ await blockMessageContact({ mailboxId, senderAddress: message.fromAddr });
+ await runSingleMessageAction(message.id, "trash");
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Could not block contact");
+ } finally {
+ setPending(false);
+ }
+ }
+
+ return (
+ <div className="flex items-center gap-0.5">
+ {error && <span className="mr-1 max-w-32 truncate text-xs text-red-600" title={error}>{error}</span>}
+ <Tooltip label={starred ? "Remove star" : "Star"}>
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ className="h-8 w-8 px-0"
+ aria-label={starred ? "Remove star" : "Star"}
+ aria-pressed={starred}
+ disabled={pending}
+ onClick={() => void onToggleStar()}
+ >
+ <Star className={starred ? "h-4 w-4 fill-amber-400 text-amber-400" : "h-4 w-4"} />
+ </Button>
+ </Tooltip>
+ <Tooltip label="Reply">
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ className="h-8 w-8 px-0"
+ aria-label="Reply"
+ disabled={pending}
+ onClick={() => void onReply("reply")}
+ >
+ <Reply className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ <div className="relative">
+ <Tooltip label="More actions">
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ className="h-8 w-8 px-0"
+ aria-label="More actions"
+ aria-expanded={moreOpen}
+ disabled={pending}
+ onClick={() => setMoreOpen((open) => !open)}
+ >
+ <MoreVertical className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ {moreOpen && (
+ <div className="absolute right-0 z-30 mt-1 w-56 rounded-xl border border-neutral-200 bg-white p-2 text-neutral-700 shadow-lg">
+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onReply("reply")}>
+ <Reply className="h-4 w-4" /> Reply
+ </button>
+ {canReplyAll && (
+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onReply("replyAll")}>
+ <ReplyAll className="h-4 w-4" /> Reply all
+ </button>
+ )}
+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onForward()}>
+ <Forward className="h-4 w-4" /> Forward
+ </button>
+ <hr className="my-1 border-neutral-100" />
+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onMessageAction(message.read ? "unread" : "read")}>
+ {message.read ? <Mail className="h-4 w-4" /> : <MailOpen className="h-4 w-4" />}
+ {message.read ? "Mark as unread" : "Mark as read"}
+ </button>
+ {moveActions.map((item) => (
+ <button key={item.action} type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onMessageAction(item.action)}>
+ {createElement(item.icon, { size: 16 })} {item.label}
+ </button>
+ ))}
+ {message.direction === "inbound" && mailboxId && (
+ <>
+ <hr className="my-1 border-neutral-100" />
+ <button type="button" className="flex w-full items-center gap-2 rounded-lg px-3 py-2 text-left text-sm hover:bg-neutral-100" onClick={() => void onBlock()}>
+ <Ban className="h-4 w-4" /> Block contact
+ </button>
+ </>
+ )}
+ </div>
+ )}
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/settings/inbox-threading-settings.tsx b/src/components/settings/inbox-threading-settings.tsx
new file mode 100644
index 0000000..c305001
--- /dev/null
+++ b/src/components/settings/inbox-threading-settings.tsx
@@ -0,0 +1,20 @@
+"use client";
+
+import { Switch } from "@/components/ui/switch";
+import { useConversationView } from "@/components/messages/use-conversation-view";
+
+export function InboxThreadingSettings() {
+ const [conversationView, setConversationView] = useConversationView();
+
+ return (
+ <label className="flex items-start gap-3 rounded-xl bg-neutral-50 p-4">
+ <span className="flex-1">
+ <span className="block text-sm font-medium text-neutral-900">Group emails into conversations</span>
+ <span className="mt-1 block text-sm text-neutral-500">
+ Show related messages together as a single thread in message lists.
+ </span>
+ </span>
+ <Switch checked={conversationView} onCheckedChange={setConversationView} />
+ </label>
+ );
+}
diff --git a/src/components/settings/settings-nav-utils.ts b/src/components/settings/settings-nav-utils.ts
index 686930f..0782c42 100644
--- a/src/components/settings/settings-nav-utils.ts
+++ b/src/components/settings/settings-nav-utils.ts
@@ -9,8 +9,8 @@ export const settingsNavSections: SettingsNavSection[] = [
label: "Account",
},
{
- href: "/settings/auto-reply",
- label: "Auto Reply",
+ href: "/settings/inbox",
+ label: "Inbox",
},
{
href: "/settings/rules",
diff --git a/src/components/ui/select-types.d.ts b/src/components/ui/select-types.d.ts
index 7962a51..0bbf09e 100644
--- a/src/components/ui/select-types.d.ts
+++ b/src/components/ui/select-types.d.ts
@@ -1,3 +1,5 @@
import type * as React from "react";
-export type SelectProps = React.ComponentProps<"select">;
+export type SelectProps = React.ComponentProps<"select"> & {
+ containerClassName?: string
+};
diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsx
index 324ee31..f978490 100644
--- a/src/components/ui/select.tsx
+++ b/src/components/ui/select.tsx
@@ -3,8 +3,8 @@ import { cn } from "@/lib/utils";
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 inline-flex">
+ ({ className, containerClassName, ...props }, ref) => (
+ <span className={cn("rounded-lg border border-neutral-200 px-2 inline-flex", containerClassName)}>
<select
className={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.ts
index b12b36e..e0d0753 100644
--- a/src/db/schema/index.ts
+++ b/src/db/schema/index.ts
@@ -142,6 +142,7 @@ export const contacts = sqliteTable(
.references(() => users.id, { onDelete: "cascade" }),
email: text("email").notNull(),
displayName: text("display_name"),
+ avatarKey: text("avatar_key"),
source: text("source", { enum: ["manual", "inbound", "outbound"] })
.notNull()
.default("inbound"),
diff --git a/src/hooks/types.d.ts b/src/hooks/types.d.ts
index 436defc..55b5ea3 100644
--- a/src/hooks/types.d.ts
+++ b/src/hooks/types.d.ts
@@ -17,6 +17,7 @@ export type Message = {
ccAddr?: string | null;
bccAddr?: string | null;
fromContactName?: string | null;
+ fromContactHasAvatar?: boolean;
toContactName?: string | null;
subject: string | null;
snippet: string | null;
diff --git a/src/lib/contacts/avatar-client-types.d.ts b/src/lib/contacts/avatar-client-types.d.ts
new file mode 100644
index 0000000..8680d3b
--- /dev/null
+++ b/src/lib/contacts/avatar-client-types.d.ts
@@ -0,0 +1,4 @@
+export type ContactAvatarChangedDetail = {
+ email: string;
+ hasAvatar: boolean;
+};
diff --git a/src/lib/contacts/avatar-client.ts b/src/lib/contacts/avatar-client.ts
new file mode 100644
index 0000000..5063dfe
--- /dev/null
+++ b/src/lib/contacts/avatar-client.ts
@@ -0,0 +1,7 @@
+import type { ContactAvatarChangedDetail } from "./avatar-client-types";
+
+export const CONTACT_AVATAR_CHANGED_EVENT = "mailflare:contact-avatar-changed";
+
+export function dispatchContactAvatarChanged(detail: ContactAvatarChangedDetail) {
+ window.dispatchEvent(new CustomEvent(CONTACT_AVATAR_CHANGED_EVENT, { detail }));
+}
diff --git a/src/lib/contacts/service.ts b/src/lib/contacts/service.ts
index 2bd8936..816a288 100644
--- a/src/lib/contacts/service.ts
+++ b/src/lib/contacts/service.ts
@@ -64,6 +64,19 @@ export async function getContactDisplayNameMap(env: CloudflareEnv, userId: strin
);
}
+export async function getContactAvatarMap(env: CloudflareEnv, userId: string, addresses: string[]) {
+ const emails = Array.from(new Set(addresses.map(normalizeEmailAddress).filter(Boolean)));
+ if (emails.length === 0) return new Map<string, boolean>();
+
+ const db = getDb(env);
+ const rows = await db
+ .select({ email: contacts.email, avatarKey: contacts.avatarKey })
+ .from(contacts)
+ .where(and(eq(contacts.userId, userId), inArray(contacts.email, emails)));
+
+ return new Map(rows.map((contact) => [contact.email, !!contact.avatarKey]));
+}
+
export async function getMessageContactNames(
env: CloudflareEnv,
userId: string,
diff --git a/src/lib/email/send.ts b/src/lib/email/send.ts
index a02af5f..f637c08 100644
--- a/src/lib/email/send.ts
+++ b/src/lib/email/send.ts
@@ -9,7 +9,7 @@ import { getAuthorizedSenderAddress } from "@/lib/email/sender";
import { getEmailAddressList, joinEmailAddressList, splitEmailAddressList } from "@/lib/email/address";
import { formatMessageIdHeader, normalizeMessageId, parseMessageIdList } from "@/lib/email/threading";
import { createAuditLog } from "@/lib/mailboxes/audit";
-import { storeMessageAttachments, validateAttachments } from "@/lib/email/attachments";
+import { loadMessageAttachmentContents, storeMessageAttachments, validateAttachments } from "@/lib/email/attachments";
import type { AttachmentContent } from "@/lib/email/attachment-types";
export type SendEmailInput = {
@@ -31,9 +31,25 @@ export type SendEmailInput = {
threadId?: string | null;
mailboxId: string;
attachments?: AttachmentContent[];
+ /** Future delivery time. Values at or before the current time send immediately. */
+ scheduledAt?: string | Date;
};
const MAX_RECIPIENTS = 50;
+const MAX_QUEUE_DELAY_SECONDS = 24 * 60 * 60;
+
+type PreparedDelivery = {
+ input: SendEmailInput;
+ messageId: string;
+ jobId: string;
+ from: string;
+ mailboxId: string;
+ to: string[];
+ cc: string[];
+ bcc: string[];
+ headers: Record<string, string>;
+ attachments: AttachmentContent[];
+};
function toRecipientList(value: string | string[] | undefined): string[] {
const entries = Array.isArray(value) ? value : splitEmailAddressList(value);
@@ -48,7 +64,10 @@ function toRecipientList(value: string | string[] | undefined): string[] {
return result;
}
-export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): Promise<{ messageId: string }> {
+export async function sendEmail(
+ env: CloudflareEnv,
+ input: SendEmailInput,
+): Promise<{ messageId: string; scheduled?: boolean }> {
const db = getDb(env);
const sender = await getAuthorizedSenderAddress(env, input);
const attachments = input.attachments ?? [];
@@ -74,6 +93,10 @@ export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): Prom
if (references.length > 0) headers.References = formatMessageIdHeader(references);
const messageId = newId("msg");
+ const requestedSchedule = input.scheduledAt ? new Date(input.scheduledAt) : null;
+ const scheduledAt = requestedSchedule && requestedSchedule.getTime() > Date.now()
+ ? requestedSchedule
+ : null;
const snippet = buildSnippet(input.text ?? null, input.html ?? null);
const toAddr = joinEmailAddressList(to);
@@ -117,11 +140,37 @@ export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): Prom
mailboxId: sender.mailboxId,
attachments: attachments.map(({ content: _content, ...attachment }) => attachment),
}),
+ scheduledAt,
});
+ const delivery: PreparedDelivery = {
+ input: { ...input, attachments: undefined },
+ messageId,
+ jobId,
+ from: sender.fromAddr,
+ mailboxId: sender.mailboxId,
+ to,
+ cc,
+ bcc,
+ headers,
+ attachments,
+ };
+ if (scheduledAt) {
+ await enqueueScheduledDelivery(env, delivery, scheduledAt);
+ return { messageId, scheduled: true };
+ }
+
+ await deliverEmail(env, delivery);
+ return { messageId };
+}
+
+async function deliverEmail(env: CloudflareEnv, delivery: PreparedDelivery): Promise<void> {
+ const { input, messageId, jobId, from, mailboxId, to, cc, bcc, headers, attachments } = delivery;
+ const db = getDb(env);
+ const toAddr = joinEmailAddressList(to);
try {
const response = await env.EMAIL.send({
- from: sender.fromAddr,
+ from,
to,
...(cc.length ? { cc } : {}),
...(bcc.length ? { bcc } : {}),
@@ -167,13 +216,11 @@ export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): Prom
});
await createAuditLog(env, {
actorUserId: input.userId,
- mailboxId: sender.mailboxId,
+ mailboxId,
messageId,
action: "email.send",
metadata: { to: toAddr, cc: cc.length ? joinEmailAddressList(cc) : undefined, subject: input.subject },
});
-
- return { messageId };
} catch (err) {
const error = err instanceof Error ? err.message : "Send failed";
await db.update(messages).set({ status: "failed" }).where(eq(messages.id, messageId));
@@ -186,11 +233,72 @@ export async function sendEmail(env: CloudflareEnv, input: SendEmailInput): Prom
}
}
-export type OutboundQueueMessage = SendEmailInput & { jobId?: string };
+export type OutboundQueueMessage = {
+ kind: "email.scheduled";
+ jobId: string;
+ messageId: string;
+ scheduledAt: string;
+};
+
+async function enqueueScheduledDelivery(
+ env: CloudflareEnv,
+ delivery: PreparedDelivery,
+ scheduledAt: Date,
+): Promise<void> {
+ const delaySeconds = Math.min(
+ MAX_QUEUE_DELAY_SECONDS,
+ Math.max(1, Math.ceil((scheduledAt.getTime() - Date.now()) / 1000)),
+ );
+ await env.OUTBOUND_QUEUE.send(
+ {
+ kind: "email.scheduled",
+ jobId: delivery.jobId,
+ messageId: delivery.messageId,
+ scheduledAt: scheduledAt.toISOString(),
+ },
+ { delaySeconds },
+ );
+}
export async function processOutboundQueue(
env: CloudflareEnv,
payload: OutboundQueueMessage,
): Promise<void> {
- await sendEmail(env, payload);
+ const db = getDb(env);
+ const [job] = await db
+ .select({ status: outboundJobs.status, payload: outboundJobs.payload })
+ .from(outboundJobs)
+ .where(eq(outboundJobs.id, payload.jobId))
+ .limit(1);
+ if (!job || job.status !== "queued") return;
+ const scheduledAt = new Date(payload.scheduledAt);
+ const input = JSON.parse(job.payload) as SendEmailInput;
+ const to = toRecipientList(input.to);
+ const cc = toRecipientList(input.cc);
+ const bcc = toRecipientList(input.bcc);
+ const inReplyTo = normalizeMessageId(input.inReplyTo);
+ const references = Array.isArray(input.references)
+ ? input.references.map((id) => normalizeMessageId(id)).filter((id): id is string => !!id)
+ : parseMessageIdList(input.references);
+ const headers: Record<string, string> = { ...input.headers };
+ if (inReplyTo) headers["In-Reply-To"] = `<${inReplyTo}>`;
+ if (references.length > 0) headers.References = formatMessageIdHeader(references);
+ const delivery: PreparedDelivery = {
+ input,
+ messageId: payload.messageId,
+ jobId: payload.jobId,
+ from: input.from,
+ mailboxId: input.mailboxId,
+ to,
+ cc,
+ bcc,
+ headers,
+ attachments: [],
+ };
+ if (scheduledAt.getTime() > Date.now()) {
+ await enqueueScheduledDelivery(env, delivery, scheduledAt);
+ return;
+ }
+ delivery.attachments = await loadMessageAttachmentContents(env, payload.messageId);
+ await deliverEmail(env, delivery);
}
diff --git a/src/lib/email/thread-view.ts b/src/lib/email/thread-view.ts
index 55fc3dd..98a4602 100644
--- a/src/lib/email/thread-view.ts
+++ b/src/lib/email/thread-view.ts
@@ -1,7 +1,7 @@
import { and, asc, eq, inArray, notInArray } from "drizzle-orm";
import { getDb } from "@/db";
import { messageAttachments, messages } from "@/db/schema";
-import { getContactDisplayNameMap } from "@/lib/contacts/service";
+import { getContactAvatarMap, getContactDisplayNameMap } from "@/lib/contacts/service";
import { getFirstEmailAddressEntry, normalizeEmailAddress } from "@/lib/email/address";
import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
import type { SessionUser } from "@/lib/auth/types";
@@ -72,12 +72,18 @@ export async function getMessageThreadForUser(env: CloudflareEnv, user: SessionU
message.userId,
rows.flatMap((row) => [row.fromAddr, getFirstEmailAddressEntry(row.toAddr)]),
);
+ const contactAvatarMap = await getContactAvatarMap(
+ env,
+ message.userId,
+ rows.map((row) => row.fromAddr),
+ );
return {
threadId: message.threadId,
messages: rows.map((row) => ({
...withoutRawKey(row),
fromContactName: contactMap.get(normalizeEmailAddress(row.fromAddr)) ?? null,
+ fromContactHasAvatar: contactAvatarMap.get(normalizeEmailAddress(row.fromAddr)) ?? false,
toContactName: contactMap.get(normalizeEmailAddress(getFirstEmailAddressEntry(row.toAddr))) ?? null,
attachments: attachmentsByMessage.get(row.id) ?? [],
})),
diff --git a/src/lib/setup/migration.ts b/src/lib/setup/migration.ts
index 73aadbf..f2e00b4 100644
--- a/src/lib/setup/migration.ts
+++ b/src/lib/setup/migration.ts
@@ -25,6 +25,7 @@ const MIGRATION_NAMES = [
"0023_add_mailbox_aliases.sql",
"0024_add_advanced_routing_and_webhook_retries.sql",
"0025_add_threading_and_cc_bcc.sql",
+ "0026_add_contact_avatars.sql",
];
const INITIAL_SCHEMA_SQL = `
@@ -45,7 +46,7 @@ CREATE TABLE IF NOT EXISTS mailbox_access (id text PRIMARY KEY NOT NULL, mailbox
CREATE UNIQUE INDEX IF NOT EXISTS mailbox_access_mailbox_user_idx ON mailbox_access(mailbox_id, user_id);
CREATE INDEX IF NOT EXISTS mailbox_access_user_idx ON mailbox_access(user_id);
CREATE INDEX IF NOT EXISTS mailbox_access_mailbox_idx ON mailbox_access(mailbox_id);
-CREATE TABLE IF NOT EXISTS contacts (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, email text NOT NULL, display_name text, source text DEFAULT 'inbound' NOT NULL, blocked integer DEFAULT false NOT NULL, last_seen_at integer, created_at integer NOT NULL);
+CREATE TABLE IF NOT EXISTS contacts (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, email text NOT NULL, display_name text, avatar_key text, source text DEFAULT 'inbound' NOT NULL, blocked integer DEFAULT false NOT NULL, last_seen_at integer, created_at integer NOT NULL);
CREATE UNIQUE INDEX IF NOT EXISTS contacts_user_email_idx ON contacts(user_id, email);
CREATE INDEX IF NOT EXISTS contacts_user_idx ON contacts(user_id);
CREATE TABLE IF NOT EXISTS folders (id text PRIMARY KEY NOT NULL, user_id text NOT NULL REFERENCES users(id) ON DELETE cascade, mailbox_id text NOT NULL REFERENCES mailboxes(id) ON DELETE cascade, name text NOT NULL, color text DEFAULT '#2563eb' NOT NULL, created_at integer NOT NULL);
diff --git a/src/lib/validators.ts b/src/lib/validators.ts
index 669cdb9..803e9e5 100644
--- a/src/lib/validators.ts
+++ b/src/lib/validators.ts
@@ -29,6 +29,7 @@ export const sendEmailSchema = z.object({
html: z.string().max(2 * 1024 * 1024).optional(),
text: z.string().max(2 * 1024 * 1024).optional(),
mailboxId: z.string().min(1).max(200),
+ scheduledAt: z.string().datetime().optional(),
attachments: z
.array(
z.object({