Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
"@mui/material": "^7.3.7",
"@mui/styled-engine-sc": "^7.3.7",
"@mui/x-charts": "^8.27.0",
"@tanstack/react-virtual": "^3.14.2",
"@types/dompurify": "^3.0.5",
"date-fns": "^4.1.0",
"dexie": "^4.4.3",
"dompurify": "^3.4.3",
"react": "^19.2.4",
"react-dom": "^19.2.4",
Expand Down
4 changes: 2 additions & 2 deletions server/internal/http/handlers/mailboxes.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ func (h *Mailboxes) ListMessages(w http.ResponseWriter, r *http.Request) {
httpx.WriteError(w, r, h.Logger, httpx.NewAPIError(http.StatusBadGateway, httpx.CodeUpstreamFailed, "imap connect", err))
return
}
envelopes, err := c.ListMessages(r.Context(), mailbox, limit, uint32(before))
envelopes, total, err := c.ListMessages(r.Context(), mailbox, limit, uint32(before))
if err != nil {
httpx.WriteError(w, r, h.Logger, httpx.NewAPIError(http.StatusBadGateway, httpx.CodeUpstreamFailed, "list messages", err))
return
}
resp := map[string]any{"messages": envelopes}
resp := map[string]any{"messages": envelopes, "total": total}
if len(envelopes) > 0 {
resp["next_before"] = envelopes[len(envelopes)-1].UID
}
Expand Down
23 changes: 13 additions & 10 deletions server/internal/imap/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -175,24 +175,27 @@ func (c *Client) selectMailbox(name string, readOnly bool) error {

// ListMessages returns up to limit envelopes from the given mailbox, newest first.
// If before > 0, only messages with UID < before are returned (cursor-style paging).
func (c *Client) ListMessages(ctx context.Context, mailbox string, limit int, before uint32) ([]hmail.Envelope, error) {
// The returned total is the mailbox's full message count (independent of the
// page), suitable for a "1–50 of N" pager.
func (c *Client) ListMessages(ctx context.Context, mailbox string, limit int, before uint32) ([]hmail.Envelope, uint32, error) {
if limit <= 0 || limit > 200 {
limit = 50
}
c.mu.Lock()
defer c.mu.Unlock()
if err := c.ensureLive(ctx); err != nil {
return nil, err
return nil, 0, err
}
if err := c.selectMailbox(mailbox, true); err != nil {
return nil, err
return nil, 0, err
}
mbox, err := c.conn.Select(mailbox, true)
if err != nil {
return nil, err
return nil, 0, err
}
if mbox.Messages == 0 {
return []hmail.Envelope{}, nil
total := mbox.Messages
if total == 0 {
return []hmail.Envelope{}, 0, nil
}

// Fetch the highest UID first; if before is set, cap the upper bound there.
Expand All @@ -204,10 +207,10 @@ func (c *Client) ListMessages(ctx context.Context, mailbox string, limit int, be
}
uids, err := c.conn.UidSearch(criteria)
if err != nil {
return nil, fmt.Errorf("uid search: %w", err)
return nil, 0, fmt.Errorf("uid search: %w", err)
}
if len(uids) == 0 {
return []hmail.Envelope{}, nil
return []hmail.Envelope{}, total, nil
}
// Newest first; take the last `limit` UIDs.
if len(uids) > limit {
Expand All @@ -226,13 +229,13 @@ func (c *Client) ListMessages(ctx context.Context, mailbox string, limit int, be
envelopes = append(envelopes, envelopeFrom(m))
}
if err := <-fetchDone; err != nil {
return nil, fmt.Errorf("fetch envelopes: %w", err)
return nil, 0, fmt.Errorf("fetch envelopes: %w", err)
}
// Sort newest-first by UID descending.
for i, j := 0, len(envelopes)-1; i < j; i, j = i+1, j-1 {
envelopes[i], envelopes[j] = envelopes[j], envelopes[i]
}
return envelopes, nil
return envelopes, total, nil
}

func envelopeFrom(m *imap.Message) hmail.Envelope {
Expand Down
2 changes: 2 additions & 0 deletions src/nonview/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ export interface MailboxListResponse {
export interface MessageListResponse {
messages: Envelope[];
next_before?: number;
// Total messages in the mailbox (independent of the page), for "1–50 of N".
total?: number;
}

export interface APIErrorBody {
Expand Down
Binary file added src/nonview/cache/db.ts
Binary file not shown.
Loading
Loading