lukasandClaude Opus 5.5
609e7c58f9
Sending: a send the server could not take (unreachable, timeout, 4xx) is no
longer failed at once. It waits in Scheduled ("retrying") and is tried again
after 1, 2, 5, 10, 30 min, then hourly, for 24 hours — on the server, so it
works with the browser closed. A permanent refusal (5xx, wrong password) is
"failed" at once, with the server's reason. GET /outbox lists both;
POST /outbox/{id}/retry (Retry now) and /cancel (Edit, Delete) act on them,
and they are left out of Drafts. Mail delivered but not filed in Sent now
counts as sent, and a conditional claim keeps two jobs from sending one
message twice. The app says when a send failed and when it finally went.
Actions: arq retries a job only on Retry, never on a plain exception, so the
"retry x5, then revert" for flags and moves never happened. Flag, move,
archive, restore, delete and empty-folder jobs now raise Retry while the
server is unreachable (~24 hours of growing gaps), skip a change a later one
replaced, stop at the first connection failure instead of 20 s per message,
and delete/empty keep the rows until the server has the messages gone.
Account health: 3 failed connections in a row mark an account unreachable
(amber in the sidebar and Settings, cleared on the next success); 3 refused
sign-ins stop its syncing as auth_failed until the password is entered
again, so the provider does not lock the account. Sync loops back off 30 s
doubling to 10 min and log one line per expected failure; a refused
connection fails at once with its reason (the connect task is kept), and a
silently dead IDLE connection is noticed within ~11 min instead of ~29.
Also: the empty reading pane is clipped to its width when dragged very
narrow; tests no longer leave live accounts and outbox rows in the database.
Migration 0021: outbox attempts / next_attempt_at / retry_until, accounts
sync_error / sync_error_since.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
81 lines
2.7 KiB
Python
81 lines
2.7 KiB
Python
"""Mailbox (folder) listing (SPEC §9.3 folder views, archive action)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
from typing import Annotated
|
|
|
|
from fastapi import APIRouter, Depends
|
|
from pydantic import BaseModel
|
|
from sqlalchemy import func, select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.db import get_session
|
|
from app.identity.deps import CurrentUser
|
|
from app.models import Draft, Mailbox, Message
|
|
from app.outbox.service import not_being_sent
|
|
|
|
router = APIRouter(prefix="/mailboxes", tags=["mail"])
|
|
|
|
DbSession = Annotated[AsyncSession, Depends(get_session)]
|
|
|
|
|
|
class MailboxOut(BaseModel):
|
|
id: uuid.UUID
|
|
account_id: uuid.UUID
|
|
path: str
|
|
special_use: str | None
|
|
|
|
|
|
class FolderCounts(BaseModel):
|
|
inbox_unread: int # unread messages sitting in Inbox mailboxes
|
|
drafts: int # drafts shown in the Drafts folder (local + un-adopted remote)
|
|
|
|
|
|
@router.get("", response_model=list[MailboxOut])
|
|
async def list_mailboxes(user: CurrentUser, db: DbSession) -> list[MailboxOut]:
|
|
rows = await db.scalars(
|
|
select(Mailbox).where(Mailbox.user_id == user.id).order_by(Mailbox.account_id, Mailbox.path)
|
|
)
|
|
return [
|
|
MailboxOut(id=m.id, account_id=m.account_id, path=m.path, special_use=m.special_use)
|
|
for m in rows
|
|
]
|
|
|
|
|
|
@router.get("/counts", response_model=FolderCounts)
|
|
async def folder_counts(user: CurrentUser, db: DbSession) -> FolderCounts:
|
|
"""Badge counts for the sidebar: unread Inbox messages and Drafts-folder items."""
|
|
inbox_unread = await db.scalar(
|
|
select(func.count())
|
|
.select_from(Message)
|
|
.join(Mailbox, Mailbox.id == Message.mailbox_id)
|
|
.where(
|
|
Message.user_id == user.id,
|
|
Mailbox.special_use == "inbox",
|
|
~Message.flags.contains(["\\Seen"]),
|
|
)
|
|
)
|
|
|
|
# Drafts folder = local drafts + IMAP-Drafts messages we haven't adopted (mirror
|
|
# UIDs excluded), matching what list_drafts + list_remote_drafts return.
|
|
local = await db.scalar(
|
|
select(func.count()).select_from(Draft).where(Draft.user_id == user.id, not_being_sent())
|
|
)
|
|
owned = {
|
|
(r.account_id, r.imap_uid)
|
|
for r in await db.execute(
|
|
select(Draft.account_id, Draft.imap_uid).where(
|
|
Draft.user_id == user.id, Draft.imap_uid.isnot(None)
|
|
)
|
|
)
|
|
}
|
|
remote_rows = await db.execute(
|
|
select(Message.account_id, Message.uid)
|
|
.join(Mailbox, Mailbox.id == Message.mailbox_id)
|
|
.where(Message.user_id == user.id, Mailbox.special_use == "drafts")
|
|
)
|
|
remote = sum(1 for r in remote_rows if (r.account_id, r.uid) not in owned)
|
|
|
|
return FolderCounts(inbox_unread=int(inbox_unread or 0), drafts=int(local or 0) + remote)
|