From 58f13ad9d78a07aab1d683462834a2493078744d Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 24 Aug 2026 12:41:46 +0200 Subject: feat(compose): open a draft to finish it Item 153. DraftStore had a write() and no reader, and nothing opened a composer from an existing message, so a draft rendered like ordinary mail and could never be finished or sent. ComposeContextBuilder::forDraft() reads one back. A new Kind::Draft seeds every field verbatim: the subject takes no Re:/Fwd: prefix, and the body goes in exactly as it was left, with none of seedBody()'s quote framing. It is reachable by double-click and by an edit_draft action in the Message menu. Three things the shape of this depends on. A resumed draft must OWN its file. Maildir has no in-place edit, so an autosave writes a new file and unlinks the old one; a composer that did not know its own path would leave the original behind and one message would become two. ComposeContext::draftPath carries it into m_draftPath, which the autosave already knew how to replace. MimeParser had no bcc, and nothing had ever needed one. MessageBuilder writes Bcc into the draft file deliberately and explains why, so a resumed draft that ignored it would drop every blind recipient from the message the user then finishes and sends, reporting nothing. edit_draft is gated on the file being inside a configured drafts folder, matched on the PATH. A `draft` tag is not enough: notmuch surfaces the Maildir D flag as one, and a message flagged by another client sits in the inbox. Offered on ordinary mail, the composer would own a file it did not write and the first autosave would delete a received message. And a live defect found on the way, which is most of why this took as long as it did. updateComposeActions() ran only from onSelectionChanged. Both signals fire for an ordinary click, so nothing had noticed; but running a query and setting the current index emits currentRowChanged ALONE, so the enablement was computed against the previously selected row. Edit draft stayed disabled on a draft selected that way, and the reply family had the same blind spot with no test that could see it. Now connected to both. Reading currentRowChanged is safe here for the reason CLAUDE.md gives: it answers "which row is current", and no count is read. WorkerBackedWindow::AccountSpec gains a drafts field, which the two new tests need and which no fixture could express before. --- src/composecontext.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/composecontext.h') diff --git a/src/composecontext.h b/src/composecontext.h index 4027af0..6f311c7 100644 --- a/src/composecontext.h +++ b/src/composecontext.h @@ -165,8 +165,21 @@ QString accountForNew(const Config &config, const QString &selectedAccount); /// treating it as a prefix means a genuine first reply gets no `Re:` and /// threads nowhere. See the patterns in composecontext.cpp for the measurement. QString replySubject(const QString &original); + QString forwardSubject(const QString &original); +/// Builds the context that RESUMES a draft from its file. +/// +/// Unlike a reply, nothing here is derived: the recipients, the subject and +/// the body are the draft's own, read back verbatim. The account comes from +/// the From header rather than from which account owns the file, because a +/// draft states who it is from and that is the user's own earlier choice. +/// +/// The returned context carries `draftPath`, which the composer seeds into +/// the path its autosave replaces. Returns a context whose kind is New, with +/// nothing filled in, when the file cannot be read. +ComposeContext forDraft(const Config &config, const QString &path); + /// The `>`-prefixed original, with an attribution line. /// /// Takes a ParsedMessage, NOT a MessageNode: the node carries no body and no -- cgit v1.2.3