Skip to content

Email for professionals and teams

Add message actions

Hieu Nguyen (Jack)7e6a7017e32c
diff --git a/drizzle/migrations/0017_add_message_star.sql b/drizzle/migrations/0017_add_message_star.sql
new file mode 100644
index 0000000..4b944e1
--- /dev/null
+++ b/drizzle/migrations/0017_add_message_star.sql
@@ -0,0 +1 @@
+ALTER TABLE `messages` ADD `starred` integer DEFAULT false NOT NULL;
diff --git a/drizzle/migrations/meta/_journal.json b/drizzle/migrations/meta/_journal.json
index 1294fcc..5e2f71e 100644
--- a/drizzle/migrations/meta/_journal.json
+++ b/drizzle/migrations/meta/_journal.json
@@ -120,6 +120,13 @@
"when": 1788000000000,
"tag": "0016_add_message_snooze",
"breakpoints": true
+ },
+ {
+ "idx": 17,
+ "version": "6",
+ "when": 1788086400000,
+ "tag": "0017_add_message_star",
+ "breakpoints": true
}
]
}
diff --git a/src/app/(dashboard)/snoozed/[messageId]/page.tsx b/src/app/(dashboard)/snoozed/[messageId]/page.tsx
new file mode 100644
index 0000000..74baa6e
--- /dev/null
+++ b/src/app/(dashboard)/snoozed/[messageId]/page.tsx
@@ -0,0 +1,3 @@
+import Page from "@/app/(dashboard)/inbox/[messageId]/page";
+
+export default Page;
diff --git a/src/app/(dashboard)/snoozed/layout.tsx b/src/app/(dashboard)/snoozed/layout.tsx
new file mode 100644
index 0000000..9513e50
--- /dev/null
+++ b/src/app/(dashboard)/snoozed/layout.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { MessageSplitLayout } from "@/components/messages/message-split-layout";
+import { snoozedFolderConfig } from "@/components/messages/message-folder-configs";
+
+export default function SnoozedLayout({ children }: { children: React.ReactNode }) {
+ return <MessageSplitLayout config={snoozedFolderConfig}>{children}</MessageSplitLayout>;
+}
diff --git a/src/app/(dashboard)/snoozed/page.tsx b/src/app/(dashboard)/snoozed/page.tsx
new file mode 100644
index 0000000..f8c74ab
--- /dev/null
+++ b/src/app/(dashboard)/snoozed/page.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { MessageFolderPage } from "@/components/messages/message-folder-page";
+import { snoozedFolderConfig } from "@/components/messages/message-folder-configs";
+
+export default function SnoozedPage() {
+ return <MessageFolderPage config={snoozedFolderConfig} />;
+}
diff --git a/src/app/(dashboard)/starred/[messageId]/page.tsx b/src/app/(dashboard)/starred/[messageId]/page.tsx
new file mode 100644
index 0000000..74baa6e
--- /dev/null
+++ b/src/app/(dashboard)/starred/[messageId]/page.tsx
@@ -0,0 +1,3 @@
+import Page from "@/app/(dashboard)/inbox/[messageId]/page";
+
+export default Page;
diff --git a/src/app/(dashboard)/starred/layout.tsx b/src/app/(dashboard)/starred/layout.tsx
new file mode 100644
index 0000000..6d615ef
--- /dev/null
+++ b/src/app/(dashboard)/starred/layout.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { MessageSplitLayout } from "@/components/messages/message-split-layout";
+import { starredFolderConfig } from "@/components/messages/message-folder-configs";
+
+export default function StarredLayout({ children }: { children: React.ReactNode }) {
+ return <MessageSplitLayout config={starredFolderConfig}>{children}</MessageSplitLayout>;
+}
diff --git a/src/app/(dashboard)/starred/page.tsx b/src/app/(dashboard)/starred/page.tsx
new file mode 100644
index 0000000..903e40f
--- /dev/null
+++ b/src/app/(dashboard)/starred/page.tsx
@@ -0,0 +1,8 @@
+"use client";
+
+import { MessageFolderPage } from "@/components/messages/message-folder-page";
+import { starredFolderConfig } from "@/components/messages/message-folder-configs";
+
+export default function StarredPage() {
+ return <MessageFolderPage config={starredFolderConfig} />;
+}
diff --git a/src/app/api/messages/[messageId]/snooze/route.ts b/src/app/api/messages/[messageId]/snooze/route.ts
index 3ed2b39..6e7e895 100644
--- a/src/app/api/messages/[messageId]/snooze/route.ts
+++ b/src/app/api/messages/[messageId]/snooze/route.ts
@@ -43,3 +43,27 @@ export async function POST(
return NextResponse.json({ ok: true });
}
+
+export async function DELETE(
+ 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 db = getDb(env);
+ const [message] = await db
+ .select({ id: messages.id, mailboxId: messages.mailboxId })
+ .from(messages)
+ .where(and(eq(messages.id, messageId), eq(messages.direction, "inbound")))
+ .limit(1);
+ if (!message?.mailboxId) 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: null }).where(eq(messages.id, message.id));
+ return NextResponse.json({ ok: true });
+}
diff --git a/src/app/api/messages/[messageId]/star/route.ts b/src/app/api/messages/[messageId]/star/route.ts
new file mode 100644
index 0000000..b62c412
--- /dev/null
+++ b/src/app/api/messages/[messageId]/star/route.ts
@@ -0,0 +1,32 @@
+import { 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";
+
+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 db = getDb(env);
+ const [message] = await db
+ .select({ id: messages.id, mailboxId: messages.mailboxId, starred: messages.starred })
+ .from(messages)
+ .where(eq(messages.id, messageId))
+ .limit(1);
+ if (!message?.mailboxId) return NextResponse.json({ error: "Message not found" }, { status: 404 });
+
+ const access = await getMailboxAccessLevel(db, user, message.mailboxId);
+ if (!access?.canRead) return NextResponse.json({ error: "Message not found" }, { status: 404 });
+
+ const starred = !message.starred;
+ await db.update(messages).set({ starred }).where(eq(messages.id, message.id));
+ return NextResponse.json({ starred });
+}
diff --git a/src/app/api/messages/counts/route.ts b/src/app/api/messages/counts/route.ts
index 5e06bd1..9451a65 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,
+ starred: messages.starred,
snoozedUntil: messages.snoozedUntil,
})
.from(messages)
diff --git a/src/app/api/messages/counts/types.d.ts b/src/app/api/messages/counts/types.d.ts
index a2393c1..b9e026d 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" | "snoozedUntil"
+ "mailboxId" | "folderId" | "direction" | "status" | "read" | "starred" | "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 516f66f..0544ab1 100644
--- a/src/app/api/messages/counts/utils.ts
+++ b/src/app/api/messages/counts/utils.ts
@@ -2,7 +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.snoozedUntil && row.snoozedUntil > new Date()) return "snoozed";
if (row.status === "trash") return "trash";
if (row.status === "spam") return "spam";
if (row.status === "archived") return "archived";
@@ -15,6 +15,8 @@ export function getMessageFolder(row: MessageCountRow): CountableFolder {
export function createEmptyFolderCounts(): MessageCounts["folders"] {
return {
inbox: { total: 0, unread: 0 },
+ starred: { total: 0, unread: 0 },
+ snoozed: { total: 0, unread: 0 },
sent: { total: 0, unread: 0 },
drafts: { total: 0, unread: 0 },
archived: { total: 0, unread: 0 },
@@ -31,6 +33,10 @@ export function buildMessageCounts(rows: MessageCountRow[]): MessageCounts {
for (const row of rows) {
const folder = getMessageFolder(row);
const unread = row.direction === "inbound" && !row.read;
+ if (row.starred) {
+ folders.starred.total += 1;
+ if (unread) folders.starred.unread += 1;
+ }
if (folder) {
folders[folder].total += 1;
if (unread) folders[folder].unread += 1;
diff --git a/src/app/api/messages/route.ts b/src/app/api/messages/route.ts
index ab6f77b..5a86783 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, lte } from "drizzle-orm";
+import { eq, desc, and, like, or, count, isNull, inArray, lte, gt } from "drizzle-orm";
import type { SQL } from "drizzle-orm";
import { getEnv } from "@/lib/cloudflare";
import { getCurrentUser } from "@/lib/auth/cookies";
@@ -25,6 +25,8 @@ export async function GET(request: Request) {
const query = url.searchParams.get("q")?.trim();
const title = url.searchParams.get("title")?.trim();
const read = url.searchParams.get("read");
+ const starred = url.searchParams.get("starred");
+ const snoozed = url.searchParams.get("snoozed");
const limit = Math.min(Number(url.searchParams.get("limit") ?? 50), 100);
const offset = Math.max(Number(url.searchParams.get("offset") ?? 0), 0);
@@ -56,6 +58,14 @@ export async function GET(request: Request) {
conditions.push(isNull(messages.folderId));
conditions.push(or(isNull(messages.snoozedUntil), lte(messages.snoozedUntil, new Date()))!);
}
+ if (starred === "true") {
+ conditions.push(eq(messages.starred, true));
+ }
+ if (snoozed === "true") {
+ conditions.push(eq(messages.status, "received"));
+ conditions.push(isNull(messages.folderId));
+ conditions.push(gt(messages.snoozedUntil, new Date()));
+ }
if (read === "read") {
conditions.push(eq(messages.read, true));
}
diff --git a/src/components/components-nav-utils.ts b/src/components/components-nav-utils.ts
index 214394a..680f0f3 100644
--- a/src/components/components-nav-utils.ts
+++ b/src/components/components-nav-utils.ts
@@ -4,7 +4,7 @@ import type { MessageFolder } from "@/hooks/types";
export async function preloadMailboxPage(href: string, mailboxId?: string) {
const customFolderMatch = href.match(/^\/folders\/([^/]+)$/);
const folder = (customFolderMatch ? "inbox" : href.slice(1)) as MessageFolder;
- const supportedFolders: MessageFolder[] = ["inbox", "sent", "drafts", "archived", "spam", "trash"];
+ const supportedFolders: MessageFolder[] = ["inbox", "starred", "snoozed", "sent", "drafts", "archived", "spam", "trash"];
if (!supportedFolders.includes(folder)) return;
const params = getMessageQueryParams(
diff --git a/src/components/dashboard-nav.tsx b/src/components/dashboard-nav.tsx
index fbf977f..a9ee967 100644
--- a/src/components/dashboard-nav.tsx
+++ b/src/components/dashboard-nav.tsx
@@ -4,6 +4,7 @@ import type { FormEvent } from "react";
import { useEffect, useState } from "react";
import {
Archive,
+ Clock,
FileText,
Folder,
Inbox,
@@ -11,6 +12,7 @@ import {
Plus,
Send,
ShieldAlert,
+ Star,
Trash2,
} from "lucide-react";
import { useSelectedMailbox } from "@/components/mailbox-provider";
@@ -41,6 +43,8 @@ import { useSidebar } from "./sidebar-state";
const links = [
{ href: "/compose", label: "Compose", icon: MailPlus, primary: true },
{ href: "/inbox", label: "Inbox", icon: Inbox, preloadMessages: true },
+ { href: "/starred", label: "Starred", icon: Star, preloadMessages: true },
+ { href: "/snoozed", label: "Snoozed", icon: Clock, preloadMessages: true },
{ href: "/sent", label: "Sent", icon: Send, preloadMessages: true },
{ href: "/drafts", label: "Drafts", icon: FileText, preloadMessages: true },
{ href: "/archived", label: "Archived", icon: Archive, preloadMessages: true },
@@ -61,6 +65,12 @@ export function DashboardNav({ className }: { className?: string }) {
if (link.href === "/inbox") {
return { ...link, count: getFolderNavCount("inbox", counts.folders) };
}
+ if (link.href === "/starred") {
+ return { ...link, count: getFolderNavCount("starred", counts.folders) };
+ }
+ if (link.href === "/snoozed") {
+ return { ...link, count: getFolderNavCount("snoozed", counts.folders) };
+ }
if (link.href === "/sent") {
return { ...link, count: getFolderNavCount("sent", counts.folders) };
}
diff --git a/src/components/messages/message-folder-configs.ts b/src/components/messages/message-folder-configs.ts
index 00976b1..b257dd4 100644
--- a/src/components/messages/message-folder-configs.ts
+++ b/src/components/messages/message-folder-configs.ts
@@ -11,6 +11,24 @@ export const inboxFolderConfig: MessageFolderConfig = {
showRowBadge: false,
};
+export const starredFolderConfig: MessageFolderConfig = {
+ folder: "starred",
+ title: "Starred",
+ emptyText: "No starred emails",
+ hrefPrefix: "/starred",
+ icon: Star,
+ badgeVariant: "outline",
+};
+
+export const snoozedFolderConfig: MessageFolderConfig = {
+ folder: "snoozed",
+ title: "Snoozed",
+ emptyText: "No snoozed emails",
+ hrefPrefix: "/snoozed",
+ icon: Clock,
+ badgeVariant: "outline",
+};
+
export const sentFolderConfig: MessageFolderConfig = {
folder: "sent",
title: "Sent",
diff --git a/src/components/messages/message-folder-page.tsx b/src/components/messages/message-folder-page.tsx
index 643e4be..2817d05 100644
--- a/src/components/messages/message-folder-page.tsx
+++ b/src/components/messages/message-folder-page.tsx
@@ -17,6 +17,7 @@ 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 { toggleMessageStar } from "./message-list-row-actions-utils";
import { MessageNavigationProgress, useMessageNavigation } from "./message-navigation";
import type { MessageFolderPageProps, MessageListRowProps } from "./types";
import {
@@ -45,10 +46,13 @@ function MessageListRow({
}: MessageListRowProps) {
const Icon = config.icon;
const { openDraftComposer } = useCompose();
- const unread = message.direction === "inbound" && !message.read;
+ const [read, setRead] = useState(message.read);
+ const [starred, setStarred] = useState(message.starred);
+ const rowMessage = { ...message, read, starred };
+ const unread = rowMessage.direction === "inbound" && !rowMessage.read;
const draggable = config.folder === "inbox" && message.direction === "inbound";
- const party = getMessageParty(message, config.folder, currentAccountName);
- const preview = getMessagePreview(message, config.folder);
+ const party = getMessageParty(rowMessage, config.folder, currentAccountName);
+ const preview = getMessagePreview(rowMessage, config.folder);
const href = `${config.hrefPrefix}/${message.id}`;
const navigation = useMessageNavigation(href, message.id);
@@ -100,24 +104,43 @@ function MessageListRow({
}
const className =
- `grid min-h-12 w-full grid-cols-[24px_32px_minmax(160px,240px)_1fr_auto] items-center gap-3 px-6 text-left text-sm hover:relative hover:z-10 hover:bg-[#f2f6fc] hover:shadow-sm ${
+ `group relative grid min-h-12 w-full grid-cols-[24px_32px_minmax(160px,240px)_1fr_auto] items-center gap-3 px-6 text-left text-sm hover:z-10 hover:bg-[#f2f6fc] hover:shadow-sm ${
active || selected ? "bg-blue-50" : ""
} ${draggable ? "cursor-grab active:cursor-grabbing" : ""}`;
const content = (
<>
- <Icon className="h-4 w-4 text-neutral-300" />
- <span className={getMessagePartyClassName(message, config.folder)}>
+ {config.folder === "inbox" && message.direction === "inbound" && (
+ <Tooltip label={starred ? "Starred" : "Not starred"}>
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ onClick={(event) => {
+ event.preventDefault();
+ event.stopPropagation();
+ void toggleMessageStar(message.id).then((result) => setStarred(result.starred));
+ }}
+ aria-label={starred ? "Starred" : "Not starred"}
+ >
+ <Icon className={`h-4 w-4 ${starred ? "fill-amber-400 text-amber-400" : "text-neutral-300"}`} />
+ </Button>
+ </Tooltip>
+ )}
+ {(config.folder !== "inbox" || message.direction !== "inbound") && (
+ <Icon className="h-4 w-4 text-neutral-300" />
+ )}
+ <span className={getMessagePartyClassName(rowMessage, config.folder)}>
{party}
</span>
<span className="truncate text-neutral-700">
<span className={unread ? "font-bold text-neutral-900" : ""}>
- {message.subject ?? "(no subject)"}
+ {rowMessage.subject ?? "(no subject)"}
</span>
- <span className="text-neutral-500"> - {getMessagePreview(message, config.folder)}</span>
+ <span className="text-neutral-500"> - {getMessagePreview(rowMessage, config.folder)}</span>
</span>
<time
dateTime={message.createdAt}
- className={`min-w-[96px] whitespace-nowrap text-right text-xs ${
+ className={`min-w-[96px] whitespace-nowrap text-right text-xs group-hover:opacity-0 ${
unread ? "font-semibold text-neutral-800" : "text-neutral-500"
}`}
>
@@ -161,10 +184,20 @@ function MessageListRow({
<Link href={href} onClick={navigation.onNavigate} className="contents">
{content}
</Link>
- {config.folder === "inbox" && message.direction === "inbound" && (
+ {(config.folder === "inbox" || config.folder === "snoozed") && message.direction === "inbound" && (
<MessageListRowActions
- message={message}
- onAction={(action) => onMessageAction(message.id, action)}
+ message={rowMessage}
+ onAction={async (action) => {
+ const previousRead = read;
+ if (action === "read") setRead(true);
+ if (action === "unread") setRead(false);
+ try {
+ await onMessageAction(message.id, action);
+ } catch (error) {
+ if (action === "read" || action === "unread") setRead(previousRead);
+ throw error;
+ }
+ }}
/>
)}
</div>
@@ -345,7 +378,7 @@ export function MessageFolderPage({
compact={compact}
currentAccountName={currentAccountName}
onSelectedChange={updateSelectedMessage}
- onMessageAction={(messageId, action) => runBulkMessageAction([messageId], action)}
+ onMessageAction={(messageId, action) => runBulkMessageAction([messageId], action, action !== "read" && action !== "unread")}
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
index 3ccd83e..43b6110 100644
--- a/src/components/messages/message-list-row-actions-utils.ts
+++ b/src/components/messages/message-list-row-actions-utils.ts
@@ -34,3 +34,21 @@ export async function snoozeMessage(messageId: string, snoozedUntil: string) {
if (!response.ok) throw new Error("Unable to snooze message");
window.dispatchEvent(new Event("mailflare:messages-changed"));
}
+
+export function isMessageSnoozed(snoozedUntil?: string | null): boolean {
+ return !!snoozedUntil && new Date(snoozedUntil) > new Date();
+}
+
+export async function unsnoozeMessage(messageId: string) {
+ const response = await authFetch(`/api/messages/${messageId}/snooze`, { method: "DELETE" });
+ if (!response.ok) throw new Error("Unable to unsnooze message");
+ window.dispatchEvent(new Event("mailflare:messages-changed"));
+}
+
+export async function toggleMessageStar(messageId: string) {
+ const response = await authFetch(`/api/messages/${messageId}/star`, { method: "POST" });
+ if (!response.ok) throw new Error("Unable to update message star");
+ const result = (await response.json()) as { starred: boolean };
+ window.dispatchEvent(new Event("mailflare:message-counts-changed"));
+ return result;
+}
diff --git a/src/components/messages/message-list-row-actions.tsx b/src/components/messages/message-list-row-actions.tsx
index 939f8b5..7855bee 100644
--- a/src/components/messages/message-list-row-actions.tsx
+++ b/src/components/messages/message-list-row-actions.tsx
@@ -7,7 +7,7 @@ import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } f
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";
+import { getSnoozePresets, isMessageSnoozed, snoozeMessage, unsnoozeMessage } from "./message-list-row-actions-utils";
export function MessageListRowActions({ message, onAction }: MessageListRowActionsProps) {
const [snoozeOpen, setSnoozeOpen] = useState(false);
@@ -15,6 +15,7 @@ export function MessageListRowActions({ message, onAction }: MessageListRowActio
const [snoozing, setSnoozing] = useState(false);
const [error, setError] = useState<string | null>(null);
const snoozePresets = getSnoozePresets();
+ const snoozed = isMessageSnoozed(message.snoozedUntil);
const readAction = message.read ? "unread" : "read";
async function handleSnooze() {
@@ -32,7 +33,7 @@ export function MessageListRowActions({ message, onAction }: MessageListRowActio
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">
+ <div className="pointer-events-none absolute right-6 top-1/2 z-10 flex -translate-y-1/2 items-center gap-1 pl-3 opacity-0 transition-opacity group-hover:pointer-events-auto group-hover:opacity-100 group-focus-within:pointer-events-auto group-focus-within:opacity-100">
<Tooltip label="Archive">
<Button type="button" variant="ghost" size="sm" onClick={() => void onAction("archive")} aria-label="Archive">
<Archive className="h-4 w-4" />
@@ -48,8 +49,14 @@ export function MessageListRowActions({ message, onAction }: MessageListRowActio
{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">
+ <Tooltip label={snoozed ? "Unsnooze" : "Snooze"}>
+ <Button type="button" variant="ghost" size="sm" onClick={() => {
+ if (snoozed) {
+ void unsnoozeMessage(message.id);
+ return;
+ }
+ setSnoozeOpen(true);
+ }} aria-label={snoozed ? "Unsnooze" : "Snooze"}>
<Clock className="h-4 w-4" />
</Button>
</Tooltip>
diff --git a/src/components/messages/utils.ts b/src/components/messages/utils.ts
index 2f17f11..3eb3311 100644
--- a/src/components/messages/utils.ts
+++ b/src/components/messages/utils.ts
@@ -62,7 +62,7 @@ export function formatEmailPageTitle({ location, total, unread, emailAddress }:
return `${location} (${count})${suffix}`;
}
-export async function runBulkMessageAction(messageIds: string[], action: string) {
+export async function runBulkMessageAction(messageIds: string[], action: string, notify = true) {
const response = await authFetch("/api/messages/bulk", {
method: "POST",
headers: { "Content-Type": "application/json" },
@@ -70,5 +70,5 @@ export async function runBulkMessageAction(messageIds: string[], action: string)
});
if (!response.ok) throw new Error("Unable to update selected messages");
- window.dispatchEvent(new Event("mailflare:messages-changed"));
+ window.dispatchEvent(new Event(notify ? "mailflare:messages-changed" : "mailflare:message-counts-changed"));
}
diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsx
index b2bb342..945eeaf 100644
--- a/src/components/ui/tooltip.tsx
+++ b/src/components/ui/tooltip.tsx
@@ -1,13 +1,29 @@
+"use client";
+
import { cn } from "@/lib/utils";
+import { useState } from "react";
import type { TooltipProps } from "./tooltip-types";
export function Tooltip({ label, children, className }: TooltipProps) {
+ const [dismissed, setDismissed] = useState(false);
+
return (
- <span className={cn("group/tooltip relative inline-flex", className)}>
+ <span
+ className={cn("group/tooltip relative inline-flex", className)}
+ onFocusCapture={() => setDismissed(false)}
+ onMouseLeave={() => setDismissed(false)}
+ onClickCapture={() => {
+ setDismissed(true);
+ if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
+ }}
+ >
{children}
<span
role="tooltip"
- className="pointer-events-none absolute left-1/2 top-full z-50 mt-2 -translate-x-1/2 whitespace-nowrap rounded-md bg-neutral-900 px-2 py-1 text-xs font-medium text-white opacity-0 shadow-lg transition-opacity delay-150 group-hover/tooltip:opacity-100 group-focus-within/tooltip:opacity-100"
+ className={cn(
+ "pointer-events-none absolute left-1/2 top-full z-50 mt-2 -translate-x-1/2 whitespace-nowrap rounded-md bg-neutral-900 px-2 py-1 text-xs font-medium text-white opacity-0 shadow-lg transition-opacity delay-150",
+ !dismissed && "group-hover/tooltip:opacity-100 group-focus-within/tooltip:opacity-100",
+ )}
>
{label}
</span>
diff --git a/src/db/schema/index.ts b/src/db/schema/index.ts
index 9ac0d58..3c61db3 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),
+ starred: integer("starred", { mode: "boolean" }).notNull().default(false),
snoozedUntil: integer("snoozed_until", { mode: "timestamp" }),
threadId: text("thread_id"),
createdAt: integer("created_at", { mode: "timestamp" })
diff --git a/src/hooks/types.d.ts b/src/hooks/types.d.ts
index c9b7f32..5677e0f 100644
--- a/src/hooks/types.d.ts
+++ b/src/hooks/types.d.ts
@@ -1,6 +1,6 @@
export type MessageStatus = "received" | "sent" | "draft" | "queued" | "failed" | "archived" | "trash" | "spam";
-export type MessageFolder = "inbox" | "sent" | "drafts" | "archived" | "trash" | "spam";
+export type MessageFolder = "inbox" | "starred" | "snoozed" | "sent" | "drafts" | "archived" | "trash" | "spam";
export type MessageDirection = "inbound" | "outbound";
@@ -19,6 +19,7 @@ export type Message = {
snippet: string | null;
status: MessageStatus | string;
read: boolean;
+ starred: 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 362795a..ca9ace8 100644
--- a/src/hooks/use-message-counts.ts
+++ b/src/hooks/use-message-counts.ts
@@ -5,6 +5,8 @@ import { clearMessageCountsCache, fetchMessageCounts } from "./utils";
const emptyCounts: MessageCounts = {
folders: {
inbox: { total: 0, unread: 0 },
+ starred: { total: 0, unread: 0 },
+ snoozed: { total: 0, unread: 0 },
sent: { total: 0, unread: 0 },
drafts: { total: 0, unread: 0 },
archived: { total: 0, unread: 0 },
@@ -43,11 +45,13 @@ export function useMessageCounts(mailboxId?: string | null, enabled = true) {
void loadCounts(true);
}
window.addEventListener("mailflare:messages-changed", onMessagesChanged);
+ window.addEventListener("mailflare:message-counts-changed", onMessagesChanged);
const refreshInterval = window.setInterval(() => void loadCounts(true), 15_000);
return () => {
cancelled = true;
window.removeEventListener("mailflare:messages-changed", onMessagesChanged);
+ window.removeEventListener("mailflare:message-counts-changed", onMessagesChanged);
window.clearInterval(refreshInterval);
};
}, [enabled, mailboxId]);
diff --git a/src/hooks/use-messages.ts b/src/hooks/use-messages.ts
index 1396e84..25556a1 100644
--- a/src/hooks/use-messages.ts
+++ b/src/hooks/use-messages.ts
@@ -26,8 +26,8 @@ export function useMessages(
useEffect(() => {
if (!enabled) return;
let cancelled = false;
- async function loadMessages(force = false) {
- setIsLoading(true);
+ async function loadMessages(force = false, showLoading = false) {
+ if (showLoading) setIsLoading(true);
try {
const params = getMessageQueryParams(folder, mailboxId, filters, folderId);
const data = await fetchMessageList(params, force);
@@ -42,7 +42,7 @@ export function useMessages(
}
}
- void loadMessages();
+ void loadMessages(false, true);
function onMessagesChanged() {
clearMessageListCache();
clearMessageCountsCache();
diff --git a/src/hooks/utils.ts b/src/hooks/utils.ts
index 347bc58..4d39e21 100644
--- a/src/hooks/utils.ts
+++ b/src/hooks/utils.ts
@@ -40,6 +40,8 @@ export function getMessageQueryParams(
params.set("direction", "inbound");
params.set("status", "received");
}
+ if (folder === "starred") params.set("starred", "true");
+ if (folder === "snoozed") params.set("snoozed", "true");
if (folder === "sent") {
params.set("direction", "outbound");