From 9be1b13b91188cf44a40c6786a83de034988cdbd Mon Sep 17 00:00:00 2001
From: "Danilo M." <danix@danix.xyz>
Date: Thu, 13 Aug 2026 20:14:25 +0200
Subject: fix(queries): stop writing keys that carry no information

Saving a generated entry wrote `"query": ""` and `"flat": true` alongside its
generator. Both reload correctly, so nothing was broken, but queries.json is
meant to be hand-edited and each redundant key is one more thing to read past.
A generated entry has no query of its own, and the sent generator already
implies flat.

Written now only when they say something, which is the rule `pinned` and
`account` already followed: `query` is skipped for a generated entry in favour
of `generated`, and `flat` is skipped when the generator implies it.

Omitting `flat` is only safe because loadSavedQueries() reapplies it from the
generator, so the two are coupled: the mutation that stops reapplying it fails
this test and one other, in both suites. That is deliberate, since a round-trip
test can otherwise pass while quietly writing less than it reads.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 tests/test_config.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'tests/test_config.cpp')

diff --git a/tests/test_config.cpp b/tests/test_config.cpp
index dfe463b..3b094ba 100644
--- a/tests/test_config.cpp
+++ b/tests/test_config.cpp
@@ -67,6 +67,7 @@ private slots:
     void anUnknownGeneratorResolvesToNothingAndReports();
     void migrationAddsSentWhenAnAccountHasOne();
     void migrationAddsNoSentWithoutTheKey();
+    void aGeneratedEntryWritesNoRedundantKeys();
     void generalSectionKeysAreActuallyRead();
     void messageZoomDefaultsAndValidates();
     void messageZoomOutOfRangeIsReported();
@@ -1572,5 +1573,54 @@ void TestConfig::migrationAddsNoSentWithoutTheKey()
     QCOMPARE(queries.at(0).name, QStringLiteral("Inbox"));
 }
 
+/// The file is meant to be hand-edited, so a key that carries no information
+/// is a key the reader has to skip past. `query` says nothing on a generated
+/// entry, and `flat` is implied by the sent generator.
+void TestConfig::aGeneratedEntryWritesNoRedundantKeys()
+{
+    QTemporaryDir dir;
+    const QString path = writeIni(dir, twoAccountsWithSent());
+    const QString queriesPath = writeQueries(dir, QStringLiteral(R"({
+        "version": 1,
+        "queries": [
+            { "name": "Sent", "generated": "sent", "pinned": true },
+            { "name": "Inbox", "query": "tag:inbox", "pinned": true }
+        ]
+    })"));
+
+    Config config;
+    config.load(path);
+    QVERIFY(config.saveSavedQueries());
+
+    QFile f(queriesPath);
+    QVERIFY(f.open(QIODevice::ReadOnly));
+    const QJsonArray array = QJsonDocument::fromJson(f.readAll())
+                                 .object()
+                                 .value(QStringLiteral("queries"))
+                                 .toArray();
+    f.close();
+
+    const QJsonObject sent = array.at(0).toObject();
+    QCOMPARE(sent.value(QStringLiteral("generated")).toString(),
+             QStringLiteral("sent"));
+    QVERIFY2(!sent.contains(QStringLiteral("query")),
+             "a generated entry has no query of its own to store");
+    QVERIFY2(!sent.contains(QStringLiteral("flat")),
+             "the sent generator implies flat; storing it says nothing");
+
+    // The ordinary entry is untouched by any of that.
+    const QJsonObject inbox = array.at(1).toObject();
+    QCOMPARE(inbox.value(QStringLiteral("query")).toString(),
+             QStringLiteral("tag:inbox"));
+
+    // And it all still reads back the same.
+    Config reloaded;
+    reloaded.load(path);
+    QCOMPARE(reloaded.savedQueries().size(), 2);
+    QVERIFY(reloaded.savedQueries().at(0).isGenerated());
+    QVERIFY2(reloaded.savedQueries().at(0).flat,
+             "flat must come back from the generator, not from the file");
+}
+
 QTEST_MAIN(TestConfig)
 #include "test_config.moc"
-- 
cgit v1.2.3