Skip to content

Email for professionals and teams

added snooze / actions on email list

Hieu Nguyen (Jack)4b23205d508c
diff --git a/drizzle/migrations/0016_add_message_snooze.sql b/drizzle/migrations/0016_add_message_snooze.sql
new file mode 100644
index 0000000..c4ee9a3
--- /dev/null
+++ b/drizzle/migrations/0016_add_message_snooze.sql
@@ -0,0 +1 @@
+ALTER TABLE `messages` ADD `snoozed_until` integer;
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index c6875c8..1294fcc 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -113,6 +113,13 @@
"when": 1787882400000,
"tag": "0015_add_forwarding_email",
"breakpoints": true
+ },
+ {
+ "idx": 16,
+ "version": "6",
+ "when": 1788000000000,
+ "tag": "0016_add_message_snooze",
+ "breakpoints": true
}
]
}
diff --git a/src/app/(admin)/accounts/[id]/mailboxes/page.tsx b/src/app/(admin)/accounts/[id]/mailboxes/page.tsx
index fe941a2..f7bc24a 100644
--- a/src/app/(admin)/accounts/[id]/mailboxes/page.tsx
+++ b/src/app/(admin)/accounts/[id]/mailboxes/page.tsx
@@ -8,98 +8,136 @@ import { Input } from "@/components/ui/input";
import { Select } from "@/components/ui/select";
import type { ManagedAccount, ManagedDomain, ManagedMailbox } from "../types";
import {
- addManagedMailbox,
- fetchManagedAccount,
- fetchManagedDomains,
- fetchManagedMailboxes,
- removeManagedMailbox,
+ addManagedMailbox,
+ fetchManagedAccount,
+ fetchManagedDomains,
+ fetchManagedMailboxes,
+ removeManagedMailbox,
} from "../utils";
export default function AccountMailboxesPage() {
- const { id } = useParams<{ id: string }>();
- const [account, setAccount] = useState<ManagedAccount | null>(null);
- const [mailboxes, setMailboxes] = useState<ManagedMailbox[]>([]);
- const [domains, setDomains] = useState<ManagedDomain[]>([]);
- const [localPart, setLocalPart] = useState("");
- const [domainId, setDomainId] = useState("");
- const [saving, setSaving] = useState(false);
- const [message, setMessage] = useState<string | null>(null);
+ const { id } = useParams<{ id: string }>();
+ const [account, setAccount] = useState<ManagedAccount | null>(null);
+ const [mailboxes, setMailboxes] = useState<ManagedMailbox[]>([]);
+ const [domains, setDomains] = useState<ManagedDomain[]>([]);
+ const [localPart, setLocalPart] = useState("");
+ const [domainId, setDomainId] = useState("");
+ const [saving, setSaving] = useState(false);
+ const [message, setMessage] = useState<string | null>(null);
- async function load() {
- const [nextAccount, nextMailboxes, nextDomains] = await Promise.all([
- fetchManagedAccount(id),
- fetchManagedMailboxes(id),
- fetchManagedDomains(),
- ]);
- setAccount(nextAccount);
- setMailboxes(nextMailboxes);
- setDomains(nextDomains);
- setDomainId((current) => current || nextDomains[0]?.id || "");
- }
+ async function load() {
+ const [nextAccount, nextMailboxes, nextDomains] = await Promise.all([
+ fetchManagedAccount(id),
+ fetchManagedMailboxes(id),
+ fetchManagedDomains(),
+ ]);
+ setAccount(nextAccount);
+ setMailboxes(nextMailboxes);
+ setDomains(nextDomains);
+ setDomainId((current) => current || nextDomains[0]?.id || "");
+ }
- useEffect(() => {
- void load().catch((error) => setMessage(error instanceof Error ? error.message : "Unable to load mailboxes"));
- }, [id]);
+ useEffect(() => {
+ void load().catch((error) =>
+ setMessage(
+ error instanceof Error ? error.message : "Unable to load mailboxes",
+ ),
+ );
+ }, [id]);
- async function addMailbox(event: React.FormEvent<HTMLFormElement>) {
- event.preventDefault();
- if (!account) return;
- setSaving(true);
- setMessage(null);
- try {
- await addManagedMailbox(account, { domainId, localPart });
- setLocalPart("");
- await load();
- } catch (error) {
- setMessage(error instanceof Error ? error.message : "Unable to add mailbox");
- } finally {
- setSaving(false);
- }
- }
+ async function addMailbox(event: React.FormEvent<HTMLFormElement>) {
+ event.preventDefault();
+ if (!account) return;
+ setSaving(true);
+ setMessage(null);
+ try {
+ await addManagedMailbox(account, { domainId, localPart });
+ setLocalPart("");
+ await load();
+ } catch (error) {
+ setMessage(
+ error instanceof Error ? error.message : "Unable to add mailbox",
+ );
+ } finally {
+ setSaving(false);
+ }
+ }
- async function removeMailbox(mailboxId: string) {
- setMessage(null);
- try {
- await removeManagedMailbox(mailboxId);
- await load();
- } catch (error) {
- setMessage(error instanceof Error ? error.message : "Unable to remove mailbox");
- }
- }
+ async function removeMailbox(mailboxId: string) {
+ setMessage(null);
+ try {
+ await removeManagedMailbox(mailboxId);
+ await load();
+ } catch (error) {
+ setMessage(
+ error instanceof Error ? error.message : "Unable to remove mailbox",
+ );
+ }
+ }
- return (
- <div className="space-y-6">
- <div>
- <h1 className="text-3xl font-medium text-neutral-900">Mailboxes</h1>
- <p className="mt-2 text-sm text-neutral-500">Manage inboxes owned by {account?.name ?? "this account"}.</p>
- </div>
- <section className="space-y-4 rounded-3xl bg-white p-6">
- <div className="space-y-2">
- {mailboxes.map((mailbox) => (
- <div key={mailbox.id} className="flex items-center justify-between rounded-2xl bg-neutral-50 px-4 py-3">
- <span className="min-w-0">
- <span className="block truncate font-medium">{mailbox.displayName || mailbox.localPart}</span>
- <span className="block truncate text-sm text-neutral-500">{mailbox.localPart}@{mailbox.hostname}</span>
- </span>
- <Button type="button" variant="ghost" size="icon" onClick={() => void removeMailbox(mailbox.id)} aria-label="Remove inbox">
- <Trash2 className="h-4 w-4 text-red-600" />
- </Button>
- </div>
- ))}
- {account && mailboxes.length === 0 && <p className="text-sm text-neutral-500">No mailboxes yet.</p>}
- </div>
- <form onSubmit={addMailbox} className="flex gap-2">
- <Input value={localPart} onChange={(event) => setLocalPart(event.target.value)} placeholder="inbox" required />
- <Select value={domainId} onChange={(event) => setDomainId(event.target.value)} className="rounded-md border border-neutral-200 bg-white px-3 text-sm">
- {domains.map((domain) => <option key={domain.id} value={domain.id}>@{domain.hostname}</option>)}
- </Select>
- <Button type="submit" disabled={!account || !domainId || saving}>
- <Plus className="h-4 w-4" />
- {saving ? "Adding..." : "Add inbox"}
- </Button>
- </form>
- </section>
- {message && <p className="text-sm text-neutral-500">{message}</p>}
- </div>
- );
+ return (
+ <div className="space-y-6">
+ <div>
+ <h1 className="text-3xl font-medium text-neutral-900">Mailboxes</h1>
+ <p className="mt-2 text-sm text-neutral-500">
+ Manage inboxes owned by {account?.name ?? "this account"}.
+ </p>
+ </div>
+ <section className="space-y-4 rounded-3xl bg-white p-6">
+ <div className="space-y-2">
+ {mailboxes.map((mailbox) => (
+ <div
+ key={mailbox.id}
+ className="flex items-center justify-between rounded-2xl bg-neutral-50 px-4 py-3"
+ >
+ <span className="min-w-0">
+ <span className="block truncate font-medium">
+ {mailbox.displayName || mailbox.localPart}
+ </span>
+ <span className="block truncate text-sm text-neutral-500">
+ {mailbox.localPart}@{mailbox.hostname}
+ </span>
+ </span>
+ <Button
+ type="button"
+ variant="ghost"
+ size="icon"
+ onClick={() => void removeMailbox(mailbox.id)}
+ aria-label="Remove inbox"
+ >
+ <Trash2 className="h-4 w-4 text-red-600" />
+ </Button>
+ </div>
+ ))}
+ {account && mailboxes.length === 0 && (
+ <p className="text-sm text-neutral-500">No mailboxes yet.</p>
+ )}
+ </div>
+ <form onSubmit={addMailbox} className="flex gap-2">
+ <Input
+ value={localPart}
+ onChange={(event) => setLocalPart(event.target.value)}
+ placeholder="inbox"
+ required
+ />
+ <Select
+ value={domainId}
+ onChange={(event) => setDomainId(event.target.value)}
+ className="rounded-md border border-neutral-200 bg-white px-3 text-sm"
+ >
+ {domains.map((domain) => (
+ <option key={domain.id} value={domain.id}>
+ @{domain.hostname}
+ </option>
+ ))}
+ </Select>
+ <Button type="submit" disabled={!account || !domainId || saving}>
+ <Plus className="h-4 w-4" />
+ {saving ? "Adding..." : "Add inbox"}
+ </Button>
+ </form>
+ </section>
+ {message && <p className="text-sm text-neutral-500">{message}</p>}
+ </div>
+ );
}
diff --git a/src/app/(admin)/accounts/[id]/page.tsx b/src/app/(admin)/accounts/[id]/page.tsx
index fa3ef29..b53ae1a 100644
--- a/src/app/(admin)/accounts/[id]/page.tsx
+++ b/src/app/(admin)/accounts/[id]/page.tsx
@@ -85,7 +85,7 @@ export default function AccountDetailsPage() {
<Input id="account-name" value={account.name} onChange={(event) => setAccount({ ...account, name: event.target.value })} />
</div>
{account.canForwardEmail && <div className="space-y-2">
- <Label htmlFor="forwarding-email">Forwarding email</Label>
+ <Label htmlFor="forwarding-email">Forwarding email (optional)</Label>
<Input
id="forwarding-email"
type="email"
diff --git a/src/app/api/accounts/[id]/route.ts b/src/app/api/accounts/[id]/route.ts
index b1e3188..fd2c311 100644
--- a/src/app/api/accounts/[id]/route.ts
+++ b/src/app/api/accounts/[id]/route.ts
@@ -51,7 +51,7 @@ export async function PATCH(request: Request, { params }: AccountRouteParams) {
role: parsed.data.role,
disabled: parsed.data.disabled,
canManageMailboxes: parsed.data.canManageMailboxes,
- forwardingEmail: parsed.data.forwardingEmail,
+ ...(parsed.data.forwardingEmail !== undefined ? { forwardingEmail: parsed.data.forwardingEmail } : {}),
}).where(eq(users.id, id));
return NextResponse.json({ ok: true });
}
diff --git a/src/app/api/messages/[messageId]/snooze/route.ts b/src/app/api/messages/[messageId]/snooze/route.ts
new file mode 100644
index 0000000..3ed2b39
--- /dev/null
+++ b/src/app/api/messages/[messageId]/snooze/route.ts
@@ -0,0 +1,45 @@
+import { and, eq } from "drizzle-orm";
+import { NextResponse } from "next/server";
+import { getDb } from "@/db";
+import { messages } from "@/db/schema";
+import { getCurrentUser } from "@/lib/auth/cookies";
+import { getEnv } from "@/lib/cloudflare";
+import { getMailboxAccessLevel } from "@/lib/mailboxes/access";
+import type { SnoozeMessagePayload } from "./types";
+import { getSnoozedUntil } from "./utils";
+
+export async function POST(
+ request: Request,
+ { params }: { params: Promise<{ messageId: string }> },
+) {
+ const { messageId } = await params;
+ const env = getEnv();
+ const user = await getCurrentUser(env, request);
+ if (!user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+
+ const payload = (await request.json()) as SnoozeMessagePayload;
+ const snoozedUntil = getSnoozedUntil(payload.snoozedUntil);
+ if (!snoozedUntil) {
+ return NextResponse.json({ error: "Choose a future snooze time" }, { status: 400 });
+ }
+
+ const db = getDb(env);
+ const [message] = await db
+ .select({ id: messages.id, mailboxId: messages.mailboxId, status: messages.status })
+ .from(messages)
+ .where(and(eq(messages.id, messageId), eq(messages.direction, "inbound")))
+ .limit(1);
+ if (!message?.mailboxId || message.status !== "received") {
+ return NextResponse.json({ error: "Message not found" }, { status: 404 });
+ }
+
+ const access = await getMailboxAccessLevel(db, user, message.mailboxId);
+ if (!access?.canManage) return NextResponse.json({ error: "Message not found" }, { status: 404 });
+
+ await db
+ .update(messages)
+ .set({ snoozedUntil })
+ .where(eq(messages.id, message.id));
+
+ return NextResponse.json({ ok: true });
+}
diff --git a/src/app/api/messages/[messageId]/snooze/types.d.ts b/src/app/api/messages/[messageId]/snooze/types.d.ts
new file mode 100644
index 0000000..4f4d26c
--- /dev/null
+++ b/src/app/api/messages/[messageId]/snooze/types.d.ts
@@ -0,0 +1,3 @@
+export type SnoozeMessagePayload = {
+ snoozedUntil?: string;
+};
diff --git a/src/app/api/messages/[messageId]/snooze/utils.ts b/src/app/api/messages/[messageId]/snooze/utils.ts
new file mode 100644
index 0000000..9e03a11
--- /dev/null
+++ b/src/app/api/messages/[messageId]/snooze/utils.ts
@@ -0,0 +1,6 @@
+export function getSnoozedUntil(value: unknown): Date | null {
+ if (typeof value !== "string") return null;
+ const snoozedUntil = new Date(value);
+ if (Number.isNaN(snoozedUntil.getTime()) || snoozedUntil <= new Date()) return null;
+ return snoozedUntil;
+}
diff --git a/src/app/api/messages/counts/route.ts b/src/app/api/messages/counts/route.ts
index 18064ea..5e06bd1 100644
--- a/src/app/api/messages/counts/route.ts
+++ b/src/app/api/messages/counts/route.ts
@@ -42,6 +42,7 @@ export async function GET(request: Request) {
direction: messages.direction,
status: messages.status,
read: messages.read,
+ snoozedUntil: messages.snoozedUntil,
})
.from(messages)
.where(and(...conditions));
diff --git a/src/app/api/messages/counts/types.d.ts b/src/app/api/messages/counts/types.d.ts
index 02fd726..a2393c1 100644
--- a/src/app/api/messages/counts/types.d.ts
+++ b/src/app/api/messages/counts/types.d.ts
@@ -3,7 +3,7 @@ import type { messages } from "@/db/schema";
export type MessageCountRow = Pick<
typeof messages.$inferSelect,
- "mailboxId" | "folderId" | "direction" | "status" | "read"
+ "mailboxId" | "folderId" | "direction" | "status" | "read" | "snoozedUntil"
>;
export type FolderAccumulator = MessageCounts["folders"];
diff --git a/src/app/api/messages/counts/utils.ts b/src/app/api/messages/counts/utils.ts
index 0421889..516f66f 100644
--- a/src/app/api/messages/counts/utils.ts
+++ b/src/app/api/messages/counts/utils.ts
@@ -2,6 +2,7 @@ import type { MessageCounts, MessageFolder } from "@/hooks/types";
import type { CountableFolder, MessageCountRow } from "./types";
export function getMessageFolder(row: MessageCountRow): CountableFolder {
+ if (row.snoozedUntil && row.snoozedUntil > new Date()) return null;
if (row.status === "trash") return "trash";
if (row.status === "spam") return "spam";
if (row.status === "archived") return "archived";
diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.ts
index 35c49b5..ab6f77b 100644
--- a/src/app/api/messages/route.ts
+++ b/src/app/api/messages/route.ts
@@ -1,5 +1,5 @@
import { NextResponse } from "next/server";
-import { eq, desc, and, like, or, count, isNull, inArray } from "drizzle-orm";
+import { eq, desc, and, like, or, count, isNull, inArray, lte } from "drizzle-orm";
import type { SQL } from "drizzle-orm";
import { getEnv } from "@/lib/cloudflare";
import { getCurrentUser } from "@/lib/auth/cookies";
@@ -54,6 +54,7 @@ export async function GET(request: Request) {
}
if (status === "received" && !folderId) {
conditions.push(isNull(messages.folderId));
+ conditions.push(or(isNull(messages.snoozedUntil), lte(messages.snoozedUntil, new Date()))!);
}
if (read === "read") {
conditions.push(eq(messages.read, true));
diff --git a/src/app/api/settings/profile/route.ts b/src/app/api/settings/profile/route.ts
index 30f224c..bf1c3ee 100644
--- a/src/app/api/settings/profile/route.ts
+++ b/src/app/api/settings/profile/route.ts
@@ -27,12 +27,13 @@ export async function PATCH(request: Request) {
if (!canForwardEmail && parsed.forwardingEmail && parsed.forwardingEmail !== user.forwardingEmail) {
return NextResponse.json({ error: "A Pro or Team license is required for email forwarding" }, { status: 403 });
}
+ const forwardingEmail = parsed.forwardingEmail === undefined ? user.forwardingEmail : parsed.forwardingEmail;
await db
.update(users)
.set({
name: parsed.name,
resetEmail: parsed.resetEmail,
- forwardingEmail: parsed.forwardingEmail,
+ forwardingEmail,
})
.where(eq(users.id, user.id));
@@ -42,7 +43,7 @@ export async function PATCH(request: Request) {
email: user.email,
name: parsed.name,
resetEmail: parsed.resetEmail,
- forwardingEmail: parsed.forwardingEmail,
+ forwardingEmail,
canForwardEmail,
},
});
diff --git a/src/components/mailbox-selector.tsx b/src/components/mailbox-selector.tsx
index 06e0d71..bca8295 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 } from "lucide-react";
+import { 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";
@@ -16,6 +16,7 @@ import type { ProfileAvatarChangedDetail } from "@/lib/profile/types";
import { MAILBOX_AVATAR_CHANGED_EVENT } from "@/lib/mailboxes/avatar-client";
import type { MailboxAvatarChangedDetail } from "@/lib/mailboxes/avatar-client-types";
import { Skeleton } from "@/components/ui/skeleton";
+import { Tooltip } from "@/components/ui/tooltip";
import type {
AccountAvatarProps,
MailboxAccountRowProps,
@@ -82,7 +83,16 @@ function MailboxAccountRow({ mailbox, unread, avatarUrl, onSelect }: MailboxAcco
avatarUrl={avatarUrl ?? `/api/mailboxes/${mailbox.id}/avatar`}
/>
<div className="min-w-0 flex-1">
- <p className="truncate text-sm font-semibold text-neutral-900">{name}</p>
+ <div className="flex items-center gap-1.5">
+ <p className="truncate text-sm font-semibold text-neutral-900">{name}</p>
+ {mailbox.type === "shared" && (
+ <Tooltip label="Shared inbox">
+ <span title="Shared inbox" aria-label="Shared inbox" className="shrink-0 text-blue-600">
+ <UsersRound className="h-3.5 w-3.5" />
+ </span>
+ </Tooltip>
+ )}
+ </div>
<p className="truncate text-xs text-neutral-500">{getMailboxAddress(mailbox)}</p>
</div>
{unread > 0 && (
@@ -166,12 +176,7 @@ export function MailboxSelector() {
const selectedAvatarUrl = selectedMailbox
? selectedMailboxAvatarUrl ?? `/api/mailboxes/${selectedMailbox.id}/avatar`
: avatarUrl;
- const otherPersonalMailboxes = mailboxes.filter(
- (mailbox) => mailbox.id !== selectedMailbox?.id && mailbox.type !== "shared",
- );
- const otherSharedMailboxes = mailboxes.filter(
- (mailbox) => mailbox.id !== selectedMailbox?.id && mailbox.type === "shared",
- );
+ const otherMailboxes = mailboxes.filter((mailbox) => mailbox.id !== selectedMailbox?.id);
const adminActive = isAdminPath(pathname);
async function logout() {
@@ -214,9 +219,16 @@ export function MailboxSelector() {
}}
/>
<div className="min-w-0 flex-1">
- <p className="truncate text-lg font-semibold text-neutral-900">
- {selectedName}
- </p>
+ <div className="flex items-center gap-2">
+ <p className="truncate text-lg font-semibold text-neutral-900">{selectedName}</p>
+ {selectedMailbox?.type === "shared" && (
+ <Tooltip label="Shared inbox">
+ <span title="Shared inbox" aria-label="Shared inbox" className="shrink-0 text-blue-600">
+ <UsersRound className="h-4 w-4" />
+ </span>
+ </Tooltip>
+ )}
+ </div>
<p className="truncate text-sm text-neutral-500">
{selectedEmail}
</p>
@@ -225,36 +237,12 @@ export function MailboxSelector() {
</div>
</div>
- {otherPersonalMailboxes.length > 0 && (
+ {otherMailboxes.length > 0 && (
<div className="mt-2 rounded-[22px] bg-white/55 p-1">
<p className="px-4 pb-1 pt-3 text-xs font-semibold uppercase tracking-wide text-neutral-500">
Other accounts
</p>
- {otherPersonalMailboxes.map((mailbox) => {
- const mailboxCount = counts.mailboxes.find((count) => count.mailboxId === mailbox.id);
- return (
- <MailboxAccountRow
- key={mailbox.id}
- mailbox={mailbox}
- unread={mailboxCount?.unread ?? 0}
- avatarUrl={mailboxAvatarUrls[mailbox.id]}
- onSelect={() => {
- setSelectedMailbox(mailbox);
- setOpen(false);
- router.push("/inbox");
- }}
- />
- );
- })}
- </div>
- )}
-
- {otherSharedMailboxes.length > 0 && (
- <div className="mt-2 rounded-[22px] bg-white/55 p-1">
- <p className="px-4 pb-1 pt-3 text-xs font-semibold uppercase tracking-wide text-neutral-500">
- Shared accounts
- </p>
- {otherSharedMailboxes.map((mailbox) => {
+ {otherMailboxes.map((mailbox) => {
const mailboxCount = counts.mailboxes.find((count) => count.mailboxId === mailbox.id);
return (
<MailboxAccountRow
diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsx
index 012e65a..643e4be 100644
--- a/src/components/messages/message-folder-page.tsx
+++ b/src/components/messages/message-folder-page.tsx
@@ -16,6 +16,7 @@ import { useMessages } from "@/hooks/use-messages";
import type { BulkMessageAction } from "@/app/api/messages/bulk/types";
import { setMessageDragData } from "@/lib/messages/drag-utils";
import { BulkMessageToolbar } from "./bulk-message-toolbar";
+import { MessageListRowActions } from "./message-list-row-actions";
import { MessageNavigationProgress, useMessageNavigation } from "./message-navigation";
import type { MessageFolderPageProps, MessageListRowProps } from "./types";
import {
@@ -39,6 +40,7 @@ function MessageListRow({
compact = false,
currentAccountName,
onSelectedChange,
+ onMessageAction,
dragMessageIds,
}: MessageListRowProps) {
const Icon = config.icon;
@@ -159,6 +161,12 @@ function MessageListRow({
<Link href={href} onClick={navigation.onNavigate} className="contents">
{content}
</Link>
+ {config.folder === "inbox" && message.direction === "inbound" && (
+ <MessageListRowActions
+ message={message}
+ onAction={(action) => onMessageAction(message.id, action)}
+ />
+ )}
</div>
);
}
@@ -337,6 +345,7 @@ export function MessageFolderPage({
compact={compact}
currentAccountName={currentAccountName}
onSelectedChange={updateSelectedMessage}
+ onMessageAction={(messageId, action) => runBulkMessageAction([messageId], action)}
dragMessageIds={selectedIds.includes(message.id) ? selectedIds : [message.id]}
/>
))}
diff --git a/src/components/messages/message-list-row-actions-utils.ts b/src/components/messages/message-list-row-actions-utils.ts
new file mode 100644
index 0000000..3ccd83e
--- /dev/null
+++ b/src/components/messages/message-list-row-actions-utils.ts
@@ -0,0 +1,36 @@
+import { authFetch } from "@/lib/auth/client";
+
+export type SnoozePreset = {
+ label: string;
+ value: string;
+};
+
+export function formatSnoozeDateTime(date: Date): string {
+ const timezoneOffset = date.getTimezoneOffset() * 60_000;
+ return new Date(date.getTime() - timezoneOffset).toISOString().slice(0, 16);
+}
+
+export function getSnoozePresets(now = new Date()): SnoozePreset[] {
+ const tomorrow = new Date(now);
+ tomorrow.setDate(tomorrow.getDate() + 1);
+ const nextWeek = new Date(now);
+ nextWeek.setDate(nextWeek.getDate() + 7);
+ const nextMonth = new Date(now);
+ nextMonth.setMonth(nextMonth.getMonth() + 1);
+
+ return [
+ { label: "Tomorrow", value: formatSnoozeDateTime(tomorrow) },
+ { label: "Next week", value: formatSnoozeDateTime(nextWeek) },
+ { label: "Next month", value: formatSnoozeDateTime(nextMonth) },
+ ];
+}
+
+export async function snoozeMessage(messageId: string, snoozedUntil: string) {
+ const response = await authFetch(`/api/messages/${messageId}/snooze`, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ snoozedUntil: new Date(snoozedUntil).toISOString() }),
+ });
+ if (!response.ok) throw new Error("Unable to snooze message");
+ window.dispatchEvent(new Event("mailflare:messages-changed"));
+}
diff --git a/src/components/messages/message-list-row-actions.tsx b/src/components/messages/message-list-row-actions.tsx
new file mode 100644
index 0000000..939f8b5
--- /dev/null
+++ b/src/components/messages/message-list-row-actions.tsx
@@ -0,0 +1,85 @@
+"use client";
+
+import { useState } from "react";
+import { Archive, Clock, Mail, MailOpen, Trash2 } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { Input } from "@/components/ui/input";
+import { Tooltip } from "@/components/ui/tooltip";
+import type { MessageListRowActionsProps } from "./types";
+import { getSnoozePresets, snoozeMessage } from "./message-list-row-actions-utils";
+
+export function MessageListRowActions({ message, onAction }: MessageListRowActionsProps) {
+ const [snoozeOpen, setSnoozeOpen] = useState(false);
+ const [snoozedUntil, setSnoozedUntil] = useState(() => getSnoozePresets()[0].value);
+ const [snoozing, setSnoozing] = useState(false);
+ const [error, setError] = useState<string | null>(null);
+ const snoozePresets = getSnoozePresets();
+ const readAction = message.read ? "unread" : "read";
+
+ async function handleSnooze() {
+ setSnoozing(true);
+ setError(null);
+ try {
+ await snoozeMessage(message.id, snoozedUntil);
+ setSnoozeOpen(false);
+ } catch (nextError) {
+ setError(nextError instanceof Error ? nextError.message : "Unable to snooze message");
+ } finally {
+ setSnoozing(false);
+ }
+ }
+
+ return (
+ <>
+ <div className="absolute right-6 top-1/2 z-10 hidden -translate-y-1/2 items-center gap-1 bg-inherit pl-3 group-hover:flex group-focus-within:flex">
+ <Tooltip label="Archive">
+ <Button type="button" variant="ghost" size="sm" onClick={() => void onAction("archive")} aria-label="Archive">
+ <Archive className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ <Tooltip label="Trash">
+ <Button type="button" variant="ghost" size="sm" onClick={() => void onAction("trash")} aria-label="Trash">
+ <Trash2 className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ <Tooltip label={readAction === "read" ? "Mark as read" : "Mark as unread"}>
+ <Button type="button" variant="ghost" size="sm" onClick={() => void onAction(readAction)} aria-label={readAction === "read" ? "Mark as read" : "Mark as unread"}>
+ {readAction === "read" ? <MailOpen className="h-4 w-4" /> : <Mail className="h-4 w-4" />}
+ </Button>
+ </Tooltip>
+ <Tooltip label="Snooze">
+ <Button type="button" variant="ghost" size="sm" onClick={() => setSnoozeOpen(true)} aria-label="Snooze">
+ <Clock className="h-4 w-4" />
+ </Button>
+ </Tooltip>
+ </div>
+
+ <Dialog open={snoozeOpen} onOpenChange={setSnoozeOpen}>
+ <DialogContent>
+ <DialogHeader>
+ <DialogTitle>Snooze email</DialogTitle>
+ <DialogDescription>Hide this email from the inbox until the time you choose.</DialogDescription>
+ </DialogHeader>
+ <div className="space-y-4">
+ <div className="grid gap-2 sm:grid-cols-3">
+ {snoozePresets.map((preset) => (
+ <Button key={preset.label} type="button" variant="outline" size="sm" onClick={() => setSnoozedUntil(preset.value)}>
+ {preset.label}
+ </Button>
+ ))}
+ </div>
+ <div className="space-y-2">
+ <label htmlFor={`snooze-until-${message.id}`} className="text-sm font-medium text-neutral-700">Select date and time</label>
+ <Input id={`snooze-until-${message.id}`} type="datetime-local" value={snoozedUntil} onChange={(event) => setSnoozedUntil(event.target.value)} />
+ </div>
+ {error && <p className="text-sm text-red-600">{error}</p>}
+ <Button type="button" onClick={() => void handleSnooze()} disabled={snoozing}>
+ {snoozing ? "Snoozing..." : "Snooze"}
+ </Button>
+ </div>
+ </DialogContent>
+ </Dialog>
+ </>
+ );
+}
diff --git a/src/components/messages/types.d.ts b/src/components/messages/types.d.ts
index c11a275..d4eeb12 100644
--- a/src/components/messages/types.d.ts
+++ b/src/components/messages/types.d.ts
@@ -23,9 +23,17 @@ export type MessageListRowProps = {
compact?: boolean;
currentAccountName?: string;
onSelectedChange: (messageId: string, selected: boolean) => void;
+ onMessageAction: (messageId: string, action: RowMessageAction) => Promise<void>;
dragMessageIds: string[];
};
+export type RowMessageAction = "archive" | "trash" | "read" | "unread";
+
+export type MessageListRowActionsProps = {
+ message: Message;
+ onAction: (action: RowMessageAction) => Promise<void>;
+};
+
export type MessageFolderPageProps = {
config: MessageFolderConfig;
compact?: boolean;
diff --git a/src/components/settings/profile-form.tsx b/src/components/settings/profile-form.tsx
index 274b40f..0e73991 100644
--- a/src/components/settings/profile-form.tsx
+++ b/src/components/settings/profile-form.tsx
@@ -77,7 +77,7 @@ export function ProfileForm({ initialName, initialResetEmail, initialForwardingE
/>
</div>
{canForwardEmail && <div className="space-y-2">
- <Label htmlFor="forwardingEmail">Forwarding email</Label>
+ <Label htmlFor="forwardingEmail">Forwarding email (optional)</Label>
<Input
id="forwardingEmail"
value={forwardingEmail}
diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts
index 5cef71f..9ac0d58 100644
--- a/src/db/schema/index.ts
+++ b/src/db/schema/index.ts
@@ -170,6 +170,7 @@ export const messages = sqliteTable(
snippet: text("snippet"),
status: text("status").notNull().default("received"),
read: integer("read", { mode: "boolean" }).notNull().default(false),
+ snoozedUntil: integer("snoozed_until", { mode: "timestamp" }),
threadId: text("thread_id"),
createdAt: integer("created_at", { mode: "timestamp" })
.notNull()
diff --git a/src/hooks/types.d.ts b/src/hooks/types.d.ts
index 9d05e30..c9b7f32 100644
--- a/src/hooks/types.d.ts
+++ b/src/hooks/types.d.ts
@@ -19,6 +19,7 @@ export type Message = {
snippet: string | null;
status: MessageStatus | string;
read: boolean;
+ snoozedUntil?: string | null;
threadId: string | null;
createdAt: string;
};
diff --git a/src/hooks/use-message-counts.ts b/src/hooks/use-message-counts.ts
index 71a5411..362795a 100644
--- a/src/hooks/use-message-counts.ts
+++ b/src/hooks/use-message-counts.ts
@@ -43,10 +43,12 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
void loadCounts(true);
}
window.addEventListener("mailflare:messages-changed", onMessagesChanged);
+ const refreshInterval = window.setInterval(() => void loadCounts(true), 15_000);
return () => {
cancelled = true;
window.removeEventListener("mailflare:messages-changed", onMessagesChanged);
+ window.clearInterval(refreshInterval);
};
}, [enabled, mailboxId]);
diff --git a/src/hooks/use-messages.ts b/src/hooks/use-messages.ts
index da0c182..1396e84 100644
--- a/src/hooks/use-messages.ts
+++ b/src/hooks/use-messages.ts
@@ -5,6 +5,7 @@ import {
clearMessageListCache,
fetchMessageList,
getMessageQueryParams,
+ MESSAGE_POLL_INTERVAL_MS,
} from "./utils";
export function useMessages(
@@ -48,10 +49,12 @@ export function useMessages(
void loadMessages(true);
}
window.addEventListener("mailflare:messages-changed", onMessagesChanged);
+ const refreshInterval = window.setInterval(() => void loadMessages(true), MESSAGE_POLL_INTERVAL_MS);
return () => {
cancelled = true;
window.removeEventListener("mailflare:messages-changed", onMessagesChanged);
+ window.clearInterval(refreshInterval);
};
}, [enabled, filters?.limit, filters?.offset, filters?.query, filters?.read, filters?.title, folder, folderId, mailboxId]);
diff --git a/src/lib/validators.ts b/src/lib/validators.ts
index d52b5fb..57cea25 100644
--- a/src/lib/validators.ts
+++ b/src/lib/validators.ts
@@ -73,7 +73,7 @@ export const updateManagedAccountSchema = z.object({
canManageMailboxes: z.boolean(),
forwardingEmail: z.preprocess(
(value) => (typeof value === "string" ? value.trim() : value),
- z.string().email().or(z.literal("")).optional().transform((value) => value || null),
+ z.string().email().or(z.literal("")).optional().transform((value) => value === undefined ? undefined : value || null),
),
});
@@ -139,7 +139,7 @@ export const updateProfileSchema = z.object({
),
forwardingEmail: z.preprocess(
(value) => (typeof value === "string" ? value.trim() : value),
- z.string().email().or(z.literal("")).transform((value) => value || null),
+ z.string().email().or(z.literal("")).optional().transform((value) => value === undefined ? undefined : value || null),
),
});