Keep mailbox flags safe and no-op updates unchanged (by Codex)

This commit is contained in:
Codex committed 2026-10-29 10:21:32 +01:00
1 parent 9101770614
commit 0fc26624d9
3 files changed
+20 -3

No files matched your search

+9
View File
@@ -141,6 +141,15 @@ Die bestehende Regel `rule:training-camps` (Typ `training_camps`) bleibt und wir
### F8 · Optionale Managerdarstellung (29.10.2026)
Das Postfach darf außerdem `news_marks` speichern: eine Map kanonischer
Manager-IDs auf Nachrichten-IDs und deren UI-Bits (`1` gelesen, `2` Papierkorb).
Fehlende Markierungen bedeuten ungelesen/im Posteingang; leere Besitzermaps
werden nicht für wirkungslose Aktionen angelegt. Das Archivieren bleibt das
vorhandene Behalten-Bit des Originalpostfachs. Die eigentliche Nachricht wird
beim Verschieben in den Papierkorb nicht aus dem Spielstand entfernt.
Ältere Spielstände ohne die optionale Map bleiben lesbar.
Editor: keine Welt-/Editoränderung; der Editor öffnet keine Karriere-OBS.
`state/modern.json` darf zusätzlich `manager_presentations` enthalten: eine Liste
mit `{id, name, portrait_style}`. `id` ist die stabile Manager-ID, `name` der
kanonische UTF-8-Anzeigename, `portrait_style` ist `photo` oder `painted`.
+6 -3
View File
@@ -8986,7 +8986,7 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
const AlmanacDate day = almanac_date(m.date_counter, g_.display_start_year);
char date[16];
std::snprintf(date, sizeof date, "%04d-%02d-%02d", day.year, day.month, day.day);
const std::string first_line = m.text.substr(0, std::min(m.text.find('\n'), size_t(80)));
const std::string first_line = m.text.substr(0, m.text.find('\n'));
const auto text = [](const std::string& t) { return cli::Json(O{{"key", nullptr}, {"text", t}, {"locale", "de"}, {"args", O{}}}); };
messages.push_back(O{{"id", id}, {"ownerManagerId", owner}, {"date", date}, {"sender", text("Postfach")},
{"subject", text(first_line)}, {"paragraphs", A{text(m.text)}}, {"category", "mail"},
@@ -10665,7 +10665,9 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
const auto box = ui_mailbox(g_, manager);
const auto it = std::find_if(box.begin(), box.end(), [&](const auto& m) { return m.first == id; });
if (it == box.end()) return refuse("unknown_message", "Diese Nachricht gibt es nicht (mehr).");
uint8_t& flags = g_.news_marks[modern::ui_manager_id(g_, manager)][id];
const std::string mark_owner=modern::ui_manager_id(g_,manager);
const auto owner_marks=g_.news_marks.find(mark_owner);
uint8_t flags=owner_marks!=g_.news_marks.end()&&owner_marks->second.count(id)?owner_marks->second.at(id):0;
const uint8_t before = flags;
const bool kept = it->second.kept_for_manager;
bool keep_toggle = false;
@@ -10682,11 +10684,12 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision
uint64_t scratch = revision;
if (!dispatch_mailbox(r, scratch, error)) { restore(); return refuse("mailbox_refused", error); }
}
if (flags == 0) g_.news_marks[modern::ui_manager_id(g_, manager)].erase(id);
if (flags == before && !keep_toggle) {
answer = modern::ui_command_result(request_id, previous, previous, {}, "Unverändert.");
std::get<cli::Json::Object>(answer.value)["outcome"] = "no_change";
} else {
if(flags)g_.news_marks[mark_owner][id]=flags;
else if(auto marks=g_.news_marks.find(mark_owner);marks!=g_.news_marks.end()){marks->second.erase(id);if(marks->second.empty())g_.news_marks.erase(marks);}
revision = previous + 1;
answer = modern::ui_command_result(request_id, previous, revision, {"news"}, "Postfach aktualisiert.");
}
+5
View File
@@ -836,6 +836,8 @@ int main(int argc, char** argv) {
const auto update = [&](const char* action, int n) {
return session.ui_command(cmd("request:nu" + std::to_string(n), "news.update", O{{"messageId", id}, {"action", action}}), rev);
};
const auto no_op_marks=session.state().news_marks;const auto no_op_revision=rev;
check(s(at(update("unread",0),"outcome"))=="no_change"&&session.state().news_marks==no_op_marks&&rev==no_op_revision,"mailbox: no-op must not create an empty owner map");
update("read", 1);
const std::string after_read = folder_of();
update("archive", 2);
@@ -849,6 +851,9 @@ int main(int argc, char** argv) {
check(after_read == "inbox+read" && after_archive == "archive+read" && after_trash == "trash+read" &&
after_restore == "inbox+read", "mailbox: read, archive, trash, restore");
check(s(at(update("restore", 5), "outcome")) == "no_change", "mailbox: an unchanged mark is no change");
update("unread",7);check(folder_of()=="inbox","mailbox: clearing the last mark is safe");
const auto cleared_marks=session.state().news_marks;const auto cleared_revision=rev;
check(s(at(update("unread",8),"outcome"))=="no_change"&&session.state().news_marks==cleared_marks&&rev==cleared_revision,"mailbox: repeated clearing is write-free");
check(s(at(session.ui_command(cmd("request:nu6", "news.update", O{{"messageId", "message:none"}, {"action", "read"}}), rev), "code")) ==
"unknown_message", "mailbox: unknown message");
}