Search: all results with a real count; bulk actions on results stay done
Search showed at most the first 50 matching messages ("1–50 of 50"). The
first page now carries the number of matching conversations, further pages
load as the list is paged through (a conversation spanning two appears once;
oldest-first loads them all, up to 40 pages), and the Unread/Pinned tabs filter
on the server, so their count covers every result.
Bulk Delete / Archive / Restore over selected results acts at once: the rows
leave the list (greyed instead when archived from a search, which still finds
them), the search results are refreshed, and the reading pane returns to
"Select a conversation". Each move landing on the server refreshes them again,
and a hidden row only comes back when no move has landed for 30 seconds — a
long batch no longer brings deleted results back.
Settings → Accounts → Notifications: shorter description.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -112,3 +112,5 @@ class SearchThreadHit(BaseModel):
|
||||
class SearchOut(BaseModel):
|
||||
threads: list[SearchThreadHit]
|
||||
cursor: str | None = None
|
||||
# Conversations matching in all (first page only; None where not counted).
|
||||
total: int | None = None
|
||||
|
||||
@@ -29,13 +29,22 @@ async def search(
|
||||
q: str = Query(""),
|
||||
cursor: str | None = None,
|
||||
limit: int = Query(50, ge=1, le=200),
|
||||
filter: str | None = Query(None, pattern="^(unread|pinned)$"),
|
||||
) -> SearchOut:
|
||||
"""One page of matching messages, grouped into conversations. ``filter``
|
||||
keeps conversations with unread mail / pinned ones (the list's Unread and
|
||||
Pinned tabs). The first page also says how many conversations match in
|
||||
all, where the search engine can count them."""
|
||||
if not q.strip():
|
||||
return SearchOut(threads=[], cursor=None)
|
||||
|
||||
backend = get_search_backend()
|
||||
query = to_search_query(q, user.id)
|
||||
hits, next_cursor = await backend.query(query, limit=limit, cursor=cursor)
|
||||
total: int | None = None
|
||||
count = getattr(backend, "count_threads", None)
|
||||
if cursor is None and count is not None:
|
||||
total = await count(query, thread_filter=filter)
|
||||
|
||||
# Group hits by thread, preserving order and keeping the first highlight.
|
||||
order: list[uuid.UUID] = []
|
||||
@@ -48,7 +57,7 @@ async def search(
|
||||
highlights[hit.thread_id] = hit.highlights
|
||||
|
||||
if not order:
|
||||
return SearchOut(threads=[], cursor=next_cursor)
|
||||
return SearchOut(threads=[], cursor=next_cursor, total=total)
|
||||
|
||||
threads = {
|
||||
t.id: t
|
||||
@@ -64,5 +73,9 @@ async def search(
|
||||
)
|
||||
for tid in order
|
||||
if tid in threads
|
||||
and (
|
||||
filter is None
|
||||
or (threads[tid].unread_count > 0 if filter == "unread" else threads[tid].pinned)
|
||||
)
|
||||
]
|
||||
return SearchOut(threads=results, cursor=next_cursor)
|
||||
return SearchOut(threads=results, cursor=next_cursor, total=total)
|
||||
|
||||
Reference in New Issue
Block a user