aboutsummaryrefslogtreecommitdiffstats
path: root/src/composewindow.cpp
diff options
context:
space:
mode:
authorDanilo M. <danix@danix.xyz>2026-08-26 13:28:51 +0200
committerDanilo M. <danix@danix.xyz>2026-08-26 13:30:22 +0200
commit0ca4624195cdd8c78ff614e3912af5b914458497 (patch)
tree6fc739e77fed6b5a4e178cacf76ac29fd708ab0b /src/composewindow.cpp
parentd835cf3c554e9657fffdb91971b66e3a74aee323 (diff)
downloadqtmaildir-0ca4624195cdd8c78ff614e3912af5b914458497.tar.gz
qtmaildir-0ca4624195cdd8c78ff614e3912af5b914458497.zip
feat: flag what you answered, mark what was forwarded to you
Item 68, which turned out to be three things once its premise was measured. The note asked to extend a "passed" subject rule to "Fw:"; there was no subject rule, and the correlation it rested on did not exist. What did exist was a gap nobody had reported. Reply and forward now flag their source. The Maildir R and P flags, which every other client sets and notmuch reads back as "replied" and "passed", had never been written here: measured on the developer's index, all 317 "replied" and all 6 "passed" came from other clients. ComposeWindow emits sourceMessageAnswered after a successful send and MainWindow routes it through sendMessageTagChange, message-scoped and off the undo stack, for the reason auto mark-read is: the flag records that the mail went, and the send cannot be undone. ComposeContext carries sourceMessageId rather than reusing inReplyTo, which is deliberately empty on a forward so the recipient's client does not file it under the thread it left. Keying on it made the "passed" half dead code that compiled and never fired. A resumed draft is excluded: its kind records how the file was opened, not what the user is doing, so flagging on it would set R from a guess. A received forward gets its own mark. Derived from the subject at paint time, storing nothing and reaching no server, because "passed" means "I forwarded this" and setting it from a guess would assert something false on 222 existing messages. subjectIsForwarded() shares forwardSubject()'s prefix table so the two cannot disagree, strips a Re: chain first, and takes extra locale spellings from [general] forward_prefixes, which extends the built-in table rather than replacing it. A mutation survived the first round and corrected a claim in the code: QRegularExpression::escape already makes a punctuation prefix inert, so the word guard is not about pattern validity. It stops a configured "-" matching "-: x". The comment and test say that now. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LXCZFLXbAii5n5wtovpdhh
Diffstat (limited to 'src/composewindow.cpp')
-rw-r--r--src/composewindow.cpp56
1 files changed, 54 insertions, 2 deletions
diff --git a/src/composewindow.cpp b/src/composewindow.cpp
index 879a9d1..afcf6a2 100644
--- a/src/composewindow.cpp
+++ b/src/composewindow.cpp
@@ -21,6 +21,7 @@
#include <QTemporaryDir>
#include "draftstore.h"
+#include "maildirname.h"
#include "messagebuilder.h"
#include "mimeparser.h"
#include "messagesender.h"
@@ -1418,11 +1419,62 @@ void ComposeWindow::send()
dialog->setStage(SendDialog::Stage::RemovingDraft);
if (!m_draftPath.isEmpty()) {
- QFile::remove(m_draftPath);
- emit draftRemoved(m_draftPath);
+ // Re-resolved, because mbsync renames an uploaded draft to add
+ // its `,U=<uid>` infix while m_draftPath still holds the name
+ // DraftStore::write() returned. Without this the remove is a
+ // silent no-op on a path that no longer exists: measured
+ // 2026-08-26 on the user's own mail, where a forwarded message
+ // was sent and filed correctly and its draft stayed in the
+ // Drafts view carrying the `D` flag.
+ //
+ // Item 163 added resolveRenamed() and wired it into the three
+ // READ sites (the pane, Reply/Forward, the draft reopen). This
+ // is the write site, and it was missed: the same rename, the
+ // same fix, one call site later.
+ //
+ // The unresolved path is emitted when nothing matches, so a
+ // draft that genuinely vanished still asks the worker to drop
+ // its index entry rather than leaving a ghost.
+ const QString actual = MaildirName::resolveRenamed(m_draftPath);
+ const QString target = actual.isEmpty() ? m_draftPath : actual;
+ QFile::remove(target);
+ emit draftRemoved(target);
m_draftPath.clear();
}
+ // Item 68. The Maildir R and P flags, recorded on the message this
+ // one answers. Both were measured missing on 2026-08-26: every one
+ // of the 317 `replied` and 6 `passed` in the developer's own index
+ // came from another client, because nothing here has ever written
+ // either.
+ //
+ // AFTER the send, never before: the flag asserts that the mail
+ // went, and an abandoned composer must leave no trace on the
+ // message it was answering.
+ //
+ // sourceMessageId, NOT inReplyTo: that header is deliberately
+ // empty on a Forward, so keying on it would have made the `passed`
+ // half dead code that compiles and never fires.
+ //
+ // A resumed Draft is deliberately excluded even when it carries a
+ // source id. Its kind records how the FILE was opened, not what the
+ // user is doing, so a draft that began as a reply cannot be told
+ // from one that began as a new message; flagging on that would set
+ // R from a guess. The cost is a missing flag on a reply finished in
+ // two sittings, which is the safe direction: maildir.synchronize_-
+ // flags is on, so a wrong flag reaches the server.
+ if (!m_context.sourceMessageId.isEmpty()) {
+ QString tag;
+ if (m_context.kind == ComposeContext::Kind::Reply
+ || m_context.kind == ComposeContext::Kind::ReplyAll) {
+ tag = QStringLiteral("replied");
+ } else if (m_context.kind == ComposeContext::Kind::Forward) {
+ tag = QStringLiteral("passed");
+ }
+ if (!tag.isEmpty())
+ emit sourceMessageAnswered(m_context.sourceMessageId, tag);
+ }
+
dialog->accept();
dialog->deleteLater();