Render typed bilingual news and preserve historical journal scope (by Codex)

This commit is contained in:
Codex authored and Codex committed 2026-10-27 05:46:07 +01:00
1 parent 1eb5e99847
commit 950d79d529
16 files changed
+6858 -81

No files matched your search

File diff suppressed because it is too large. Load diff
+160
View File
@@ -0,0 +1,160 @@
<!-- SPDX-License-Identifier: GPL-3.0-only -->
# Nativer Presse-Renderer und historisches Journal v2 (by Codex)
`assets/modern/news-catalog.json` enthält die 113 selbst verfassten deutschen und
englischen Vorlagen aus dem HTML-Katalog. Das ist eigener UI-Text, keine
Zeitungsdatenbank und kein Originalspielinhalt. Die neue C++-Komponente rendert
explizit übergebene semantische Ereignisse; sie erzeugt weder Presseereignisse
noch GameState-, Kalender-, Geld- oder Zufallsregeln.
## Reine Schnittstelle
`NewsCatalog::load(path)` oder der JSON-Konstruktor prüfen den Katalog.
`registry()` liefert Vorlagen-ID, Ereignistyp, Variante, erlaubte Bereiche,
Parameterschemata und Konsistenzregeln. Eine doppelte ID, unbekannte Parametertypen,
Regeln oder nicht deklarierte Platzhalter werden abgewiesen.
```cpp
NewsCatalog catalogue = NewsCatalog::load(resource_path);
NewsEvent event;
event.id = "career:example:transfer:42"; // Vorkommnis-ID, keine UI-Revision
event.type = "transfer.signed";
event.date = "2032-07-01";
event.scope = {NewsScopeKind::club, {"club:example", "FC Beispiel", {}}};
event.data = {{"player", {{"id", "player:42"}, {"name", "Alex Beispiel"}}},
{"fromClub", {{"id", "club:other"}, {"name", "SV Beispiel"}}}};
auto rendered = catalogue.from_event(event);
// {ok:true,article} oder {ok:false,error:{code,fields}}
```
Zusätzlich gibt es `from_event(Json, context)` für Adapter, `from_almanac` für
das vorhandene flache Almanachrecordformat und `example(template_id, options)`
als **ausdrücklichen UI-Testpfad**. Beispiele sind immer als `demo:true`
markiert. Ein fehlendes reales Ereignis, eine fehlende Pflichtangabe oder ein
unbekannter Enginepfad führt niemals automatisch zu einem Beispielartikel.
Kein UI-Timer publiziert Nachrichten.
`NewsScopeKind` trennt Club, National und Global. `NewsLanguage` trennt Deutsch
und Englisch. Die Registry validiert jedes Feld in `NewsEvent::data`: Entitäten,
Personen, Listen, Ergebnispaare, Datum, Saison, Geld, Booleanwerte, fachliche
Ganzzahlgrenzen und bekannte Enumerationen. Teamnamen stammen ausschließlich
aus dem Ereignisbereich; ein Manager kann ausdrücklich im Ereignis oder Kontext
gegeben sein. Es werden keine fehlenden Torschützen, Gehälter, Ablösen,
Leihenden oder Spielminuten erfunden. Sparsame Varianten besitzen eigene
Verträge für tatsächlich unbekannte Werte.
Die Ergebnisse enthalten dieselben Artikel- und Ereignisschemata wie der eigene
JS-Katalog: `schema:bmh-news-article@1`, `catalogueVersion`, stabile `id`,
`eventId`, `eventType`, `templateId`, `date`, `kind`, `tone`, `scope`,
`dedupeKey`, `fingerprint`, normalisierte `event`-Fakten und beide fertigen
`translations.de/en`. Die Schlüsselidentität ist das kanonische Tupel
`[scope.kind,scope.id,event.id]`; FNV64 und kanonische Fakten entsprechen dem
HTML-Vertrag. Sprache und Überschriftenfassung ändern die Identität nicht.
`validate_article` prüft Faktenidentität und erhält gespeicherte Prosa; ein
später bearbeiteter Katalog überschreibt keine alten Sprachsnapshots.
## Datum, Geld und Unicode
Datumswerte sind echte ISO-Daten; Texte werden zentral als de-DE/en-GB-Datum,
Zahlen, Einheiten, Listen, Ordinalzahlen und Währung formatiert. Datum hängt nicht
von der lokalen Zeitzone ab. UTF-8 wird auf gültige Skalare, Steuerzeichen und
Längengrenzen geprüft. World-/Adapternamen kommen aus dem bereits normalisierten
Datensatz und bleiben in dessen kanonischer Schreibweise erhalten. Der Renderer
führt keine zusätzliche NFC-Laufzeitbibliothek ein. Ein Adapter für andere
Namensquellen ist selbst für deren vereinbarte kanonische Normalisierung
verantwortlich; eine allgemeine Unicode-Normalisierungsparität für beliebige
unkanonisierte Fremdeingaben wird nicht behauptet.
`NewsMinorMoney` ist ausdrücklich ein Betrag mit **zwei Dezimalstellen**. Er
konvertiert nicht implizit aus einem nativen Integer oder allgemeinen Money-DTO.
Das vorhandene allgemeine DTO ist `{minor:string,currency,minorUnits:0..4}`.
`news_money_from_dto` prüft diese Felder und skaliert ausschließlich exakt:
| DTO | News-Minorwert |
|---|---|
| `minor:"12", minorUnits:0` | `1200` |
| `minor:"12", minorUnits:1` | `120` |
| `minor:"12", minorUnits:2` | `12` |
| `minor:"120", minorUnits:3` | `12` |
| `minor:"1200", minorUnits:4` | `12` |
Inexacte Teilcentwerte, negative Beträge, fehlende Einheiten, ungültige
Währungen oder Überläufe werden abgewiesen, niemals gerundet oder als Majorwert
erraten. Ein direkter allgemeiner DTO ist kein gültiger News-Moneywert; der
Adapter muss die explizite Konvertierung benutzen. Die Vorlagen verwenden
nichtnegative semantische Betragsgrößen; ob ein Enginewert eine Zahlung,
Forderung oder negative Buchung bedeutet, entscheidet der Ereignisadapter.
Auch Zeitbezüge wie das in einer Vorlage ausdrücklich genannte Monatsgehalt
müssen vor Übergabe belegt sein; bei unbekanntem Gehalt gibt es die sparsame
Vertragsvariante. Unterstützte Währungscodes sind EUR, GBP, USD, CHF und DEM.
Alle Ausgaben sind **Textdaten**, kein Rml-/HTML-Markup. Der bestehende native
Presenter escaped sie einmal. Ersatzwerte werden nicht erneut als Template
interpretiert, auch wenn ein Name `{{club}}` oder `<img>` enthält.
## Journal und Scope
`news_journal.*` bietet einen reinen v2-Store mit `items`, dauerhaftem `seen`-
Ledger und getrenntem `unbound`-Altbestand. `publish_news_article` nimmt nur einen
vom Katalog validierten Artikel entgegen. Gleiches Vorkommnis und gleiche
Fakten liefern `deduped:true` ohne Änderung am Store; widersprüchliche Fakten
liefern `news_event_id_conflict`. Löschen verschiebt in den Papierkorb und
behält das Ledger, sodass Replay nichts dupliziert oder wiederherstellt.
Grenzen sind 500 aktuelle Datensätze, 100 ungebundene Altzeilen und 2.000 Ledger-
Einträge; volle Kapazität wird ausdrücklich gemeldet und nicht still verworfen.
Der Aufrufer besitzt die äußere Revisionsprüfung und atomare Sourcepublikation.
Die bestehenden `demo_news_view`, `demo_news_unread` und `edit_demo_news`
verwenden dieselben Scopeguards. Clubartikel erscheinen nur beim passenden
Club, Nationalartikel nur beim passenden Nationalteam; ausdrücklich globale
Kalenderartikel sind gemeinsam. Finanz-/Transfer-/Stadion-/Hallenartikel können
nicht als globale oder nationale Clubberichte importiert werden. Tablet,
Detailansicht, Archiv, Sammellesen und Desktop-Widget verwenden diese Projektion.
Backendaktionen auf fremde oder ungebundene IDs werden abgewiesen; ein anderer
Owner kann nicht durch eine Sammelaktion unsichtbare Clubzeilen ändern.
Bekannte neu erstellte Demoartikel frieren die historische Person, den Club und
fertigen Text sofort im **bekannten Erstellkontext** ein. Danach werden keine
`{{club}}`-/`{{manager}}`-Platzhalter mehr gegen den aktuellen Menschen ersetzt.
Ein Rollen-/Managerwechsel verändert Ansichten, keine alten Fakten. Die optionale
Sprachprojektion liest nur fertige `translations`; sie schreibt keine Texte um.
Die aktuelle allgemeine native UI bietet weiterhin Deutsch, der reine Renderer
und die Journalprojektion sind für beide Sprachsnapshots vorbereitet.
Die bisherige v1 speicherte nur rohe Templates, Datum und Statusflags, aber
keinen beweisbaren historischen Owner. Solche vorhandenen v1-Zeilen werden
**unverändert nach `unbound` übernommen**, ohne den heutigen Menschen als alten
Besitzer zu erfinden. Sie erscheinen weder als Club- noch Nationalartikel; die
UI nennt die erhaltene Altbestandszahl. Ein bloßer Read migriert nichts und
ändert weder Revision noch Dirty. Die normale Ladegrenze migriert einmalig im
staged Zustand, bevor die saubere Baseline gesetzt wird. Der Altbestand bleibt
über Save/Load erhalten und kann später über einen gesonderten belegbaren
Altarchivpfad erschlossen werden.
Ein tatsächlicher neuer `start` erzeugt die Demo-Defaults erst **nach** Annahme
von Person, Club, Rolle und Datum. Join, Umbenennung, Rollenwechsel und alte
Migration tun dies nicht. Ein National-only-Start erhält keine Clubdefaults.
Das verhindern die tatsächlichen Source.start-Regressionsfälle mit FreshCoach
und einem anderen als dem Default-Erstclub.
## Anbindungsstand und Prüfung
Die Resource, reiner Renderer und Journal-API sind nutzbare UI-Teilkomponenten.
Die bestehenden nativen Journalaktionen und Save/Load bleiben erhalten. Ein
Presse-Engineadapter oder automatischer Engineevent-Abonnent gehört nicht zu
diesem Paket. Die Demo-Fixturefactory in `modern_news_ui_tests --write-fixtures
<directory> <catalogue.json>` publiziert ausdrücklich drei eigene Testereignisse
für Club 0, einen anderen Club und Deutschland; das ist kein Ersatz für fehlende
reale Engineinformationen.
`modern_news_catalog_tests` vergleicht 370 vollständige eigene JS-/C++-Snapshots,
einschließlich beider Sprachen, aller 113 Vorlagen, aller Bereiche sowie Geld-
und Prozentgrenzen. IDs, Fingerprints, beide Texte und normalisierte Fakten
werden vollständig verglichen. Weitere Fälle prüfen Pflichtangaben, falsche
Typen, unbekannte Daten, Money-DTOMapping, literale UTF-8-/Markupdaten,
Archivtextänderungen, Locale-Replay und dauerhafte Löschdedupe.
`modern_news_ui_tests` prüft historische Besitzer, fremde/nationale Scopeguards,
unveränderte Reads, konservative Migration, Aktionen, Revisions-/Undo-Schutz,
Save/Load und die tatsächliche Startidentität. Native Linux-/RmlUI-Scopes werden
zusätzlich über echte Menüeingaben geprüft; konkrete Schlussbelege bleiben
privat. Windows und macOS werden damit nicht als interaktiv geprüft ausgegeben.
+11 -9
View File
@@ -9,14 +9,15 @@ Repositorys. Die Implementierung verwendet die gemeinsame 3840×2160-Fläche:
Das Tablet ist 2720×2040 groß; Schrift, Kamera, Rahmen und Homebar sind native
UI-Elemente. Midnight, Silver und Matchday verwenden dieselben Themenvariablen.
Das Vereinsjournal zeigt Vereinswappen, aktuellen Vereinsnamen und Spieldatum,
Das nach aktuellem Team gefilterte Spieljournal zeigt Vereinswappen, aktuellen Vereinsnamen und Spieldatum,
die kicker-Wortmarke, Postfach und Archiv mit Gesamtzahlen, Suche, „Alle gelesen“
und die Zahl der angezeigten ungelesenen Meldungen. Zwölf ausdrücklich fiktive
Meldungen beginnen mit neun Postfach- und drei Archivmeldungen, davon fünf
und die Zahl der angezeigten ungelesenen Meldungen. Im bekannten Club-Erstellkontext beginnen zwölf ausdrücklich fiktive
Demomeldungen mit neun Postfach- und drei Archivmeldungen, davon fünf
ungelesen. Die Anfangsdaten entstehen relativ zum aktuellen Spieldatum, auch
über Monats-, Jahres- und Schaltjahresgrenzen hinweg. Gespeicherte Vorlagen
lösen `{{club}}` und `{{manager}}` erst in der Projektion gegen den aktuellen
ersten Manager auf. Ein Managerwechsel behält deshalb keine alten Namen.
über Monats-, Jahres- und Schaltjahresgrenzen hinweg. Neue Meldungen binden Person, Team und Text einmalig bei ihrer Erstellung.
Manager-/Rollenwechsel benennen alte Fakten nicht um; vorhandene rohe v1-Vorlagen
ohne historischen Besitzernachweis bleiben separat und unverändert erhalten.
Die [native Katalog-/v2-Schnittstelle](NATIVE_CATALOG.md) beschreibt den Vertrag.
Die sechs Kategorien verwenden vorhandene GUI-Bilder für Spielbetrieb,
Verträge, Bargeld, Training und Stadion sowie das Vereinswappen aus dem OBW.
Feste Kategorieillustrationen gehören zur externen GUI-Ressourcensammlung.
@@ -57,8 +58,9 @@ erneuten Öffnen derselben Welt in der laufenden UI-Sitzung erhalten. Anders als
im HTML-Prototyp gelangen diese reinen Ansichtsparameter nicht in einen
Spielcheckpoint; Laden einer Welt beginnt mit dem Postfach ohne Suche.
Die Grenze zur Quelle liegt in `DataSource`/`DemoSource`: `news` enthält nur
`version` und maximal 100 strikt validierte Meldungen. Ältere Demo-Checkpoints
Die Grenze zur Quelle liegt in `DataSource`/`DemoSource`: `news` verwendet v2 mit gebundenen Fakten, Statusflags,
Dedupeledger und getrenntem ungebundenem Altbestand. Reads filtern gegen den
aktuellen Team-/Nationalbereich und verändern keine Daten. Ältere Demo-Checkpoints
ohne `news` werden beim Laden ergänzt; vorhandene fehlerhafte Postfächer werden
atomar abgewiesen. Aktionen schreiben ausschließlich diesen Präsentationsblock.
Es gibt weder `GameState`-Zugriffe noch Änderungen an Geld, Kader, Kalender,
@@ -66,7 +68,7 @@ Weltkatalog oder Zufallsströmen. Eine spätere Session-Quelle muss echte Meldun
und deren Zuständigkeit liefern; Ereigniserzeugung und Gameplay bleiben offen.
`modern_news_ui_tests` verwendet ausschließlich synthetische Kataloge und prüft
Migration, dynamische Identität und Daten, Suche, Zähler, Lesen, Sammellesen,
Migration, historische Identität und Scope, Suche, Zähler, Lesen, Sammellesen,
Archiv/Zurückholen/Löschen, kleine Undo-Patches, Konflikte, strikte Validierung,
Revisionen sowie Save/Load und atomare Ablehnung fehlerhafter Checkpoints.
Visuelle Prüfung und native Eingabereplays erfolgen zusätzlich bei 1280×720
+9 -2
View File
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-only
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp demo_opening.cpp)
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp demo_opening.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui_mods STATIC mod_library.cpp)
@@ -38,7 +38,7 @@ endif()
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
FetchContent_GetProperties(rmlui)
file(MAKE_DIRECTORY "${modern_assets}")
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss live.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss settings.rcss widgets.rcss files.rcss front.rcss entry.rcss opening.rcss select_menu.rcss career.rcss national.rcss)
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss live.rcss transfer.rcss career_reports.rcss rankings.rcss stadium.rcss statistics.rcss news.rcss news-catalog.json settings.rcss widgets.rcss files.rcss front.rcss entry.rcss opening.rcss select_menu.rcss career.rcss national.rcss)
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
@@ -132,3 +132,10 @@ foreach(component statistics news settings desktop files entry opening career li
endif()
add_test(NAME modern_${component}_ui_tests COMMAND modern_${component}_ui_tests)
endforeach()
add_executable(modern_news_catalog_tests ../../../tests/modern_news_catalog_tests.cpp)
target_link_libraries(modern_news_catalog_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
target_compile_options(modern_news_catalog_tests PRIVATE /utf-8)
endif()
add_test(NAME modern_news_catalog_tests COMMAND modern_news_catalog_tests "${CMAKE_SOURCE_DIR}/assets/modern/news-catalog.json" "${CMAKE_SOURCE_DIR}/tests/fixtures/modern_news_catalog_reference.json")
+85 -27
View File
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/demo_news.hpp"
#include "modern/ui/demo_career.hpp"
#include "modern/ui/news_journal.hpp"
#include <algorithm>
#include <array>
#include <cctype>
@@ -69,6 +70,12 @@ std::string news_category(const std::string &kind) {
return "Training";
if (kind == "stadium")
return "Stadion";
if (kind == "national")
return "Nationalteam";
if (kind == "indoor")
return "Halle";
if (kind == "career")
return "Karriere";
return {};
}
std::string news_replace(std::string text, const std::string &key,
@@ -99,6 +106,33 @@ bool news_valid_pair(const Json &v) {
}
} // namespace
Json demo_news_scope(const Json &state, const Catalog *world) {
try {
if (state.value("career", Json::object()).value("ended", false) ||
!state.contains("managers") || state.at("managers").empty())
return Json();
const auto &m = demo_career_manager(state);
const auto role = state.value("career", Json::object())
.value("role", state.value("edits", Json::object())
.value("setup", Json::object())
.value("league", true)
? "club"
: "national");
if (role == "national")
return {{"kind", "national"},
{"id", "national-de"},
{"name", "Deutschland"},
{"names", {{"de", "Deutschland"}, {"en", "Germany"}}}};
if (role != "club" || !m.contains("club") || !m.at("club").is_string())
return Json();
const auto id = m.at("club").get<std::string>();
const auto *c = world ? world->find("clubs", id) : nullptr;
return {{"kind", "club"}, {"id", id}, {"name", c ? world->name(*c) : id}};
} catch (...) {
return Json();
}
}
std::string news_display_date(const std::string &s) {
return news_date(s)
? s.substr(8, 2) + "." + s.substr(5, 2) + "." + s.substr(0, 4)
@@ -183,11 +217,22 @@ Json demo_news(const Catalog &world, const Json &state) {
{"read", f.read},
{"folder", f.folder}});
}
return {{"version", 1}, {"items", items}};
const auto scope = demo_news_scope(state, &world);
// These old authored fixtures are specifically club stories. Do not invent
// national equivalents or republish club finances under a national header.
if (scope.is_null() || scope.at("kind") != "club")
return empty_news_journal();
const auto &manager = demo_career_manager(state);
return bind_created_news(
items, scope,
{{"id", "portrait:" + std::to_string(manager.value("portrait", 0))},
{"name", manager.value("name", std::string())}});
}
bool valid_demo_news(const Json &state) {
try {
const auto &news = state.at("news");
if (news.value("version", 0) == 2)
return valid_news_journal(news);
if (!news_keys(news, {"version", "items"}) ||
!news.at("version").is_number_integer() || news.at("version") != 1 ||
!news.at("items").is_array() || news.at("items").size() > 100)
@@ -216,8 +261,15 @@ bool migrate_demo_news(Json &state, const Catalog &world) {
try {
if (!state.is_object())
return false;
if (state.contains("news"))
return valid_demo_news(state);
if (state.contains("news")) {
if (!valid_demo_news(state))
return false;
auto proposed = state.at("news");
if (!migrate_news_journal(proposed))
return false;
state["news"] = std::move(proposed);
return true;
}
auto next = state;
next["news"] = demo_news(world, state);
if (!valid_demo_news(next))
@@ -229,7 +281,7 @@ bool migrate_demo_news(Json &state, const Catalog &world) {
}
}
std::string edit_demo_news(Json &state, const Json &action, const Catalog &) {
if (!valid_demo_news(state))
if (!valid_demo_news(state) || state.at("news").at("version") != 2)
return "invalid_news_state";
try {
if (!action.is_object() || !action.contains("kind") ||
@@ -237,13 +289,15 @@ std::string edit_demo_news(Json &state, const Json &action, const Catalog &) {
return "invalid_news_action";
const auto kind = action.at("kind").get<std::string>();
auto next = state;
const auto scope = demo_news_scope(state);
auto &items = next["news"]["items"];
if (kind == "read-all") {
if (!news_keys(action, {"kind", "folder"}) ||
!news_folder(action.at("folder"), false))
return "invalid_news_action";
for (auto &item : items)
if (item.at("folder") == action.at("folder"))
if (item.at("folder") == action.at("folder") &&
news_row_visible(item, scope))
item["read"] = true;
} else if (kind == "read" || kind == "move") {
if (!(kind == "read" ? news_keys(action, {"kind", "id"})
@@ -252,7 +306,7 @@ std::string edit_demo_news(Json &state, const Json &action, const Catalog &) {
(kind == "move" && !news_folder(action.at("folder"))))
return "invalid_news_action";
auto found = std::find_if(items.begin(), items.end(), [&](const auto &m) {
return m.at("id") == action.at("id");
return m.at("id") == action.at("id") && news_row_visible(m, scope);
});
if (found == items.end() || found->at("folder") == "trash")
return "news_not_found";
@@ -277,7 +331,7 @@ std::string edit_demo_news(Json &state, const Json &action, const Catalog &) {
return "invalid_news_action";
auto found =
std::find_if(items.begin(), items.end(), [&](const auto &m) {
return m.at("id") == p.at("id");
return m.at("id") == p.at("id") && news_row_visible(m, scope);
});
if (found == items.end() || news_pair(*found) != p.at("after"))
return "news_undo_conflict";
@@ -299,41 +353,41 @@ int demo_news_unread(const Json &state) {
return 0;
int count = 0;
for (const auto &m : state.at("news").at("items"))
if (m.at("folder") == "inbox" && !m.at("read").get<bool>())
if (m.at("folder") == "inbox" && !m.at("read").get<bool>() &&
news_row_visible(m, demo_news_scope(state)))
++count;
return count;
}
Json demo_news_view(const Catalog &world, const Json &state,
const std::string &folder, const std::string &query) {
const std::string &folder, const std::string &query,
const std::string &language) {
if (!valid_demo_news(state) || (folder != "inbox" && folder != "archive") ||
query.size() > 120)
query.size() > 120 || (language != "de" && language != "en"))
return {{"ok", false}, {"error", "invalid_news_view"}};
std::string manager, club_id, club_name;
if (state.contains("managers") && state.at("managers").is_array() &&
!state.at("managers").empty()) {
const auto &m = demo_career_manager(state);
manager = m.value("name", "");
club_id = m.value("club", "");
if (const auto *c = world.find("clubs", club_id))
club_name = world.name(*c);
}
const auto resolve = [&](const std::string &v) {
return news_replace(news_replace(v, "{{club}}", club_name), "{{manager}}",
manager);
};
const auto scope = demo_news_scope(state, &world);
const auto &person =
state.contains("managers") && !state.at("managers").empty()
? demo_career_manager(state)
: Json::object();
const auto manager = person.value("name", std::string()),
club_id = scope.is_object() ? scope.value("id", std::string())
: std::string(),
club_name = scope.is_object() ? scope.value("name", std::string())
: std::string();
Json shown = Json::array(), counts = {{"inbox", 0}, {"archive", 0}};
bool can_read = false;
for (auto m : state.at("news").at("items")) {
const auto location = m.at("folder").get<std::string>();
if (location == "trash")
if (location == "trash" || !news_row_visible(m, scope))
continue;
counts[location] = counts.at(location).get<int>() + 1;
if (location != folder)
continue;
if (!m.at("read").get<bool>())
can_read = true;
m["title"] = resolve(m.at("title").get<std::string>());
m["body"] = resolve(m.at("body").get<std::string>());
const auto rendered = news_row_text(m, language);
m["title"] = rendered.at("title");
m["body"] = rendered.at("body");
m["category"] = news_category(m.at("kind").get<std::string>());
m["display_date"] = news_display_date(m.at("date").get<std::string>());
const auto haystack = news_fold(m.at("title").get<std::string>() + " " +
@@ -362,6 +416,10 @@ Json demo_news_view(const Catalog &world, const Json &state,
{"club", club_id},
{"club_name", club_name},
{"manager", manager},
{"date", news_display_date(state.value("date", std::string()))}};
{"date", news_display_date(state.value("date", std::string()))},
{"scope", scope},
{"unbound_count", state.at("news").value("version", 1) == 2
? state.at("news").at("unbound").size()
: state.at("news").at("items").size()}};
}
} // namespace bmh::modern_ui
+5 -3
View File
@@ -3,9 +3,10 @@
#include "modern/ui/catalog.hpp"
namespace bmh::modern_ui {
// Presentation-only journal. Templates remain persisted, then resolve against
// the current snapshot's first manager/club. No catalogue or engine mutation.
// Presentation-only journal with historical text/owner snapshots. Unknown v1
// ownership is retained separately, never inferred from the current manager.
Json demo_news(const Catalog &, const Json &full_state);
Json demo_news_scope(const Json &, const Catalog * = nullptr);
bool valid_demo_news(const Json &full_state);
bool migrate_demo_news(Json &full_state, const Catalog &);
// read{id}, read-all{folder}, move{id,folder}, undo{patch:[{id,before,after}]}.
@@ -18,6 +19,7 @@ int demo_news_unread(const Json &full_state);
// date. Query and folder belong to the view and never enter a checkpoint.
Json demo_news_view(const Catalog &, const Json &full_state,
const std::string &folder = "inbox",
const std::string &query = {});
const std::string &query = {},
const std::string &language = "de");
std::string news_display_date(const std::string &);
} // namespace bmh::modern_ui
+1
View File
@@ -320,6 +320,7 @@ ActionResult DemoSource::apply(const Action &action) {
next["edits"]["setup"]=options;
next["career"]=demo_career_defaults(next.at("managers"),options);
next["career_views"]=Json::object();
next["news"] = demo_news(*catalog_, next);
} else if (next.contains("career")) {
const int active=next["career"].value("active_portrait",0);
if (std::none_of(next["managers"].begin(),next["managers"].end(),[&](const auto &m){return m.value("portrait",0)==active;}))
File diff suppressed because it is too large. Load diff
+66
View File
@@ -0,0 +1,66 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "modern/ui/catalog.hpp"
#include <optional>
namespace bmh::modern_ui {
enum class NewsLanguage { de, en };
enum class NewsScopeKind { club, national, global };
struct NewsEntity {
std::string id, name;
std::optional<std::pair<std::string, std::string>> localized_names;
Json json() const;
};
struct NewsScope {
NewsScopeKind kind = NewsScopeKind::club;
NewsEntity team;
Json json() const;
};
// Always two decimal places, unlike the general DTO's explicit minorUnits.
// No implicit conversion from DTO/native integer amounts is provided.
struct NewsMinorMoney {
int64_t minor = 0;
std::string currency;
Json json() const;
};
std::optional<NewsMinorMoney> news_money_from_dto(const Json &,
std::string &error);
struct NewsEvent {
std::string id, type, date;
NewsScope scope;
Json data =
Json::object(); // Every field is validated against registry types.
std::optional<std::string> variant;
bool demo = false;
Json json() const;
};
struct NewsRenderContext {
NewsLanguage language = NewsLanguage::de;
std::optional<NewsEntity> manager;
std::optional<std::string> as_of;
Json json() const;
};
// Pure authored-text renderer. Names come from the normalized world/adapter;
// UTF-8 is checked and preserved. This module adds no Unicode runtime library.
class NewsCatalog {
public:
explicit NewsCatalog(Json catalogue);
static NewsCatalog load(const fs::path &);
Json registry() const;
const Json &data() const { return catalogue_; }
Json from_event(const NewsEvent &, const NewsRenderContext & = {}) const;
Json from_event(const Json &, const Json &context = Json::object()) const;
Json validate_article(const Json &) const;
Json example(const std::string &template_id,
const Json &options = Json::object()) const;
Json from_almanac(const Json &, const Json &) const;
private:
Json catalogue_;
};
// Stable canonical facts/dedupe identity, matching the HTML event contract.
std::string news_canonical(const Json &);
std::string news_hash(const std::string &);
bool news_iso_date(const std::string &);
bool news_scope_matches(const Json &article_scope, const Json &current_scope);
} // namespace bmh::modern_ui
+4 -3
View File
@@ -52,9 +52,10 @@ void App::news_after_render() {
}
void App::news_update_feed() {
const auto s = snap();
const auto data =
demo_news_view(*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""));
const auto data = demo_news_view(
*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""),
ui_preferences_.at("display").value("language", std::string("de")));
if (!data.value("ok", false))
return;
if (auto *feed = element("news-feed")) {
+282
View File
@@ -0,0 +1,282 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/news_journal.hpp"
#include <algorithm>
#include <set>
namespace bmh::modern_ui {
namespace {
bool str(const Json &v, size_t maximum, bool required = true) {
return v.is_string() && v.get_ref<const std::string &>().size() <= maximum &&
v.get_ref<const std::string &>().find('\0') == std::string::npos &&
(!required || v.get_ref<const std::string &>().find_first_not_of(
" \t\r\n") != std::string::npos);
}
bool id(const Json &v, size_t maximum = 140) {
return str(v, maximum) && v.get_ref<const std::string &>().find_first_not_of(
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrst"
"uvwxyz0123456789:_./-") == std::string::npos;
}
bool row_id(const Json &v) {
return str(v, 64) &&
v.get_ref<const std::string &>().find_first_not_of(
"abcdefghijklmnopqrstuvwxyz0123456789-") == std::string::npos;
}
bool scope(const Json &v) {
return v.is_object() && v.contains("id") && v.contains("name") &&
v.contains("kind") && id(v.at("id")) && str(v.at("name"), 480) &&
(v.at("kind") == "club" || v.at("kind") == "national" ||
v.at("kind") == "global");
}
bool category(const Json &v) {
return v == "club" || v == "fixture" || v == "transfer" || v == "finance" ||
v == "training" || v == "stadium" || v == "national" ||
v == "indoor" || v == "career";
}
bool location(const Json &v) {
return v == "inbox" || v == "archive" || v == "trash";
}
bool legacy_row(const Json &v) {
return v.is_object() && v.size() == 7 && row_id(v.at("id")) &&
str(v.at("date"), 10) && news_iso_date(v.at("date")) &&
category(v.at("kind")) && str(v.at("title"), 640) &&
str(v.at("body"), 4800, false) && v.at("read").is_boolean() &&
location(v.at("folder"));
}
bool valid_owner(const Json &v) {
return v.is_null() ||
(v.is_object() && v.contains("id") && v.contains("name") &&
id(v.at("id")) && str(v.at("name"), 480));
}
bool bound_row(const Json &v) {
if (!v.is_object() || (v.size() != 9 && v.size() != 10) ||
!row_id(v.at("id")) || !str(v.at("date"), 10) ||
!news_iso_date(v.at("date")) || !category(v.at("kind")) ||
!str(v.at("title"), v.contains("article") ? 960 : 160) ||
!str(v.at("body"), v.contains("article") ? 8800 : 1200, false) ||
!v.at("read").is_boolean() || !location(v.at("folder")) ||
!scope(v.at("scope")) || !valid_owner(v.at("owner")))
return false;
const auto kind = v.at("scope").at("kind");
if ((v.at("kind") == "finance" || v.at("kind") == "transfer" ||
v.at("kind") == "stadium" || v.at("kind") == "indoor") &&
kind != "club")
return false;
if (v.at("kind") == "national" && kind != "national")
return false;
if (kind == "global" && v.at("kind") != "career")
return false;
if (v.contains("article")) {
const auto &a = v.at("article");
if (!a.is_object() || a.at("schema") != "bmh-news-article@1" ||
a.at("id") != v.at("id") || a.at("date") != v.at("date") ||
a.at("kind") != v.at("kind") || a.at("headline") != v.at("title") ||
a.at("body") != v.at("body") ||
news_canonical(a.at("scope")) != news_canonical(v.at("scope")))
return false;
const auto key = news_canonical(Json::array(
{a.at("scope").at("kind"), a.at("scope").at("id"), a.at("eventId")}));
if (!a.at("event").is_object() ||
a.at("event").at("id") != a.at("eventId") ||
a.at("event").at("type") != a.at("eventType") ||
a.at("event").at("date") != a.at("date") ||
news_canonical(a.at("event").at("scope")) !=
news_canonical(a.at("scope")))
return false;
if (a.at("dedupeKey") != key || a.at("id") != "evt-" + news_hash(key) ||
a.at("fingerprint") != news_hash(news_canonical(a.at("event"))))
return false;
if (a.at("language") != "de" && a.at("language") != "en")
return false;
for (auto language : {"de", "en"})
if (!str(a.at("translations").at(language).at("headline"), 960) ||
!str(a.at("translations").at(language).at("body"), 8800, false))
return false;
const std::string language = a.at("language");
if (a.at("translations").at(language).at("headline") != v.at("title") ||
a.at("translations").at(language).at("body") != v.at("body"))
return false;
}
return true;
}
std::string resolve(const std::string &source, const std::string &club,
const std::string &manager) {
std::string out;
size_t at = 0;
while (at < source.size()) {
const auto mark = source.find("{{", at);
if (mark == source.npos) {
out += source.substr(at);
break;
}
out += source.substr(
at, mark - at); // Inserted entity text is never expanded a second time.
if (source.compare(mark, 8, "{{club}}") == 0) {
out += club;
at = mark + 8;
} else if (source.compare(mark, 11, "{{manager}}") == 0) {
out += manager;
at = mark + 11;
} else {
out += source.substr(mark, 2);
at = mark + 2;
}
}
return out;
}
Json failure(const char *code) {
return {{"ok", false},
{"error", {{"code", code}, {"fields", Json::array()}}}};
}
} // namespace
Json empty_news_journal() {
return {{"version", 2},
{"items", Json::array()},
{"unbound", Json::array()},
{"seen", Json::array()}};
}
bool valid_news_journal(const Json &v) {
try {
if (!v.is_object() || v.size() != 4 || v.at("version") != 2 ||
!v.at("items").is_array() || v.at("items").size() > 500 ||
!v.at("unbound").is_array() || v.at("unbound").size() > 100 ||
!v.at("seen").is_array() || v.at("seen").size() > 2000)
return false;
std::set<std::string> ids, ledger_ids, keys;
for (const auto &m : v.at("unbound"))
if (!legacy_row(m) || !ids.insert(m.at("id")).second)
return false;
for (const auto &m : v.at("items"))
if (!bound_row(m) || !ids.insert(m.at("id")).second)
return false;
for (const auto &s : v.at("seen")) {
if (!s.is_object() || s.size() != 3 || !str(s.at("key"), 500) ||
!str(s.at("id"), 64) ||
(!str(s.at("fingerprint"), 16) ||
s.at("fingerprint").get_ref<const std::string &>().size() != 16 ||
s.at("fingerprint")
.get_ref<const std::string &>()
.find_first_not_of("0123456789abcdef") !=
std::string::npos) ||
!keys.insert(s.at("key")).second ||
!ledger_ids.insert(s.at("id")).second)
return false;
const auto key = Json::parse(s.at("key").get<std::string>());
if (!key.is_array() || key.size() != 3 ||
(key[0] != "club" && key[0] != "national" && key[0] != "global") ||
!id(key[1]) || !id(key[2]) || s.at("key") != news_canonical(key) ||
s.at("id") != "evt-" + news_hash(s.at("key")))
return false;
}
for (const auto &m : v.at("items"))
if (m.contains("article")) {
const auto &a = m.at("article");
const auto found = std::find_if(
v.at("seen").begin(), v.at("seen").end(),
[&](const auto &s) { return s.at("key") == a.at("dedupeKey"); });
if (found == v.at("seen").end() || found->at("id") != a.at("id") ||
found->at("fingerprint") != a.at("fingerprint"))
return false;
}
return true;
} catch (...) {
return false;
}
}
bool migrate_news_journal(Json &v) {
try {
if (valid_news_journal(v))
return true;
if (!v.is_object() || v.size() != 2 || v.at("version") != 1 ||
!v.at("items").is_array() || v.at("items").size() > 100)
return false;
auto proposed = empty_news_journal();
proposed["unbound"] = v.at("items");
if (!valid_news_journal(proposed))
return false;
v = std::move(proposed);
return true;
} catch (...) {
return false;
}
}
Json bind_created_news(const Json &legacy_items, const Json &owner_scope,
const Json &manager) {
if (!scope(owner_scope) || !valid_owner(manager) || manager.is_null() ||
!legacy_items.is_array())
throw editor::Error("invalid_news_creation_context");
auto out = empty_news_journal();
for (const auto &m : legacy_items) {
if (!legacy_row(m))
throw editor::Error("invalid_news_creation_item");
auto bound = m;
bound["title"] =
resolve(m.at("title"), owner_scope.at("name"), manager.at("name"));
bound["body"] =
resolve(m.at("body"), owner_scope.at("name"), manager.at("name"));
bound["scope"] = owner_scope;
bound["owner"] = manager;
out["items"].push_back(std::move(bound));
}
if (!valid_news_journal(out))
throw editor::Error("invalid_news_creation");
return out;
}
bool news_row_visible(const Json &row, const Json &current_scope) {
try {
return row.is_object() && row.contains("scope") && scope(row.at("scope")) &&
news_scope_matches(row.at("scope"), current_scope);
} catch (...) {
return false;
}
}
Json news_row_text(const Json &row, const std::string &language) {
if (row.contains("article")) {
const auto &texts =
row.at("article").at("translations").at(language == "en" ? "en" : "de");
return {{"title", texts.at("headline")}, {"body", texts.at("body")}};
}
return {{"title", row.at("title")}, {"body", row.at("body")}};
}
Json publish_news_article(Json &journal, const NewsCatalog &catalogue,
const Json &article, const Json &owner) {
if (!valid_news_journal(journal) || !valid_owner(owner))
return failure("invalid_news_state");
const auto checked = catalogue.validate_article(article);
if (!checked.value("ok", false))
return checked;
const auto &key = article.at("dedupeKey");
for (const auto &old : journal.at("seen"))
if (old.at("key") == key)
return old.at("fingerprint") == article.at("fingerprint")
? Json{{"ok", true}, {"id", old.at("id")}, {"deduped", true}}
: failure("news_event_id_conflict");
for (const auto &m : journal.at("items"))
if (m.at("id") == article.at("id"))
return failure("news_article_id_collision");
for (const auto &s : journal.at("seen"))
if (s.at("id") == article.at("id"))
return failure("news_article_id_collision");
if (journal.at("items").size() >= 500 || journal.at("seen").size() >= 2000)
return failure("news_capacity");
auto next = journal;
next["items"].insert(next["items"].begin(),
Json{{"id", article.at("id")},
{"date", article.at("date")},
{"kind", article.at("kind")},
{"title", article.at("headline")},
{"body", article.at("body")},
{"read", false},
{"folder", "inbox"},
{"scope", article.at("scope")},
{"owner", owner},
{"article", article}});
next["seen"].push_back({{"key", key},
{"id", article.at("id")},
{"fingerprint", article.at("fingerprint")}});
if (!valid_news_journal(next))
return failure("invalid_news_state");
journal = std::move(next);
return {{"ok", true}, {"id", article.at("id")}, {"deduped", false}};
}
} // namespace bmh::modern_ui
+20
View File
@@ -0,0 +1,20 @@
// SPDX-License-Identifier: GPL-3.0-only
#pragma once
#include "modern/ui/news_catalog.hpp"
namespace bmh::modern_ui {
// Version2 keeps immutable facts, mutable read/folder flags and a durable
// ledger. Unknown historical owners are retained separately, never attributed
// to the person/team that happens to open an old checkpoint.
Json empty_news_journal();
bool valid_news_journal(const Json &);
bool migrate_news_journal(Json &);
Json bind_created_news(const Json &legacy_items, const Json &scope,
const Json &manager);
bool news_row_visible(const Json &row, const Json &scope);
Json news_row_text(const Json &row, const std::string &language = "de");
// The caller supplies an explicitly validated catalogue/event result, not a
// guessed engine fallback. Duplicate delivery is a completely write-free read.
Json publish_news_article(Json &journal, const NewsCatalog &,
const Json &article, const Json &owner = Json());
} // namespace bmh::modern_ui
+63 -33
View File
@@ -2,9 +2,19 @@
std::string App::render_news_art(const Json &message, double size) {
const auto kind = message.at("kind").get<std::string>();
std::string art;
if (kind == "club")
art = crest(club(snap()), size * .69);
else {
if (kind == "national" ||
(message.contains("scope") &&
message.at("scope").value("kind", "") == "national"))
art = picture(
renderer_.diagram("news-national-flag", ui_nation_flag_svg("de"), 176),
size * .69, size * .46);
else if (kind == "club" || kind == "career") {
const auto id =
message.value("scope", Json::object()).value("id", std::string());
art = crest(snap().world->find("clubs", id), size * .69);
if (art.empty())
art = glyph("world", size * .55);
} else {
const auto key =
kind == "fixture" ? "button.league"
: kind == "transfer" ? "button.contracts"
@@ -29,13 +39,17 @@ std::string App::render_news_feed(const Json &data) {
(unread ? " is-unread" : "") + "\">";
if (unread)
out += "<span class=\"news-unread-dot\"></span>";
out += render_news_art(m) +
"<div class=\"news-message-copy\"><div "
"class=\"news-message-meta\"><span>" +
esc(m.at("display_date").get<std::string>()) +
"</span><span class=\"news-category\">" +
esc(m.at("category").get<std::string>()) + "</span>" +
(unread ? "<span class=\"news-new\">Neu</span>" : "") + "</div>";
out +=
render_news_art(m) +
"<div class=\"news-message-copy\"><div "
"class=\"news-message-meta\"><span>" +
esc(m.at("display_date").get<std::string>()) +
"</span><span class=\"news-category\">" +
esc(m.at("category").get<std::string>()) + "</span>" +
(unread ? "<span class=\"news-new\">Neu</span>" : "") +
(data.value("fictional", false) ? "<span class=\"news-new\">Demo</span>"
: "") +
"</div>";
out += btn("news-open", esc(name), "news-message-title",
"id=\"news-read-" + id + "\" data-id=\"" + id +
"\" aria-label=\"Nachricht lesen: " + esc(name) + "\"");
@@ -70,10 +84,10 @@ std::string App::render_news_feed(const Json &data) {
: archive ? "Dein Archiv ist noch leer"
: "Alles auf dem neuesten Stand") +
"</h3><p>" +
std::string(
query ? "Versuche einen anderen Suchbegriff."
: archive ? "Archivierte Meldungen bleiben hier zum Nachlesen."
: "Hier erscheinen neue Meldungen aus deinem Verein.") +
std::string(query ? "Versuche einen anderen Suchbegriff."
: archive
? "Archivierte Meldungen bleiben hier zum Nachlesen."
: "Hier erscheinen neue Meldungen für dein Team.") +
"</p></div>";
}
return out;
@@ -107,9 +121,10 @@ std::string App::render_news() {
news_world_ = s.world;
news_source_ = source_.get();
}
const auto data =
demo_news_view(*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""));
const auto data = demo_news_view(
*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""),
ui_preferences_.at("display").value("language", std::string("de")));
if (!data.value("ok", false))
return window("Nachrichten",
"<p>Das Nachrichtenpostfach ist nicht verfügbar.</p>");
@@ -118,11 +133,18 @@ std::string App::render_news() {
"<div id=\"news-underlay\" class=\"news-layout\"><div "
"class=\"news-masthead\"><div class=\"news-brand\"><span "
"class=\"news-wordmark\">kicker</span><div><p>DEIN "
"VEREINSJOURNAL</p><h2>Nachrichten</h2></div></div><div "
"SPIELJOURNAL</p><h2>Nachrichten</h2></div></div><div "
"class=\"news-owner\"><div><strong>" +
esc(data.at("club_name").get<std::string>()) + "</strong><p>" +
esc(data.at("date").get<std::string>()) + "</p></div>" +
crest(club(s), 88) + "</div></div>";
(data.value("scope", Json::object()).value("kind", std::string()) ==
"national"
? picture(renderer_.diagram("news-header-national",
ui_nation_flag_svg("de"), 176),
88, 59)
: crest(s.world->find("clubs", data.value("club", std::string())),
88)) +
"</div></div>";
content += "<div class=\"news-navigation\"><div class=\"news-tabs\" "
"role=\"tablist\" aria-label=\"Postfach und Archiv\">";
for (const auto &f : {std::string("inbox"), std::string("archive")})
@@ -160,19 +182,25 @@ std::string App::render_news() {
" · " + std::to_string(data.at("shown_unread").get<int>()) +
" ungelesen"
: feedback);
content +=
"</p>" +
btn("news-undo",
glyph("undo", 32) + "<span>Rückgängig</span>",
"news-undo",
"id=\"news-undo\" style=\"display:" +
std::string(news_undo_.is_array() && !news_undo_.empty()
? "flex"
: "none") +
";\"") +
"</div></div>";
if (data.value("unbound_count", size_t(0)))
content +=
esc(" · " + std::to_string(data.at("unbound_count").get<size_t>()) +
(data.at("unbound_count").get<size_t>() == 1
? " Altbestand ohne Besitzerbeleg unverändert erhalten"
: " Altbestände ohne Besitzerbeleg unverändert erhalten"));
content += "</p>" +
btn("news-undo", glyph("undo", 32) + "<span>Rückgängig</span>",
"news-undo",
"id=\"news-undo\" style=\"display:" +
std::string(news_undo_.is_array() && !news_undo_.empty()
? "flex"
: "none") +
";\"") +
"</div></div>";
if (!news_dialog_.empty()) {
const auto all = demo_news_view(*s.world, s.state, folder, "");
const auto all = demo_news_view(
*s.world, s.state, folder, "",
ui_preferences_.at("display").value("language", std::string("de")));
const auto &items = all.at("items");
const auto found =
std::find_if(items.begin(), items.end(),
@@ -188,14 +216,16 @@ std::string App::render_news() {
"id=\"window-close\" aria-label=\"Fenster schließen\"") +
"<h1>Nachrichten</h1></div><div class=\"content\">" + content +
"</div><div class=\"news-screen-footer\"><span>Fiktive "
"Vereinsmeldungen · Modern UI "
"Meldungen · Modern UI "
"Demo</span><span>OpenBMH</span></div><div "
"class=\"news-homebar\"></div></div>";
}
std::string App::render_news_widget(const Json &object) {
const auto s = snap();
const auto data = demo_news_view(*s.world, s.state, "inbox", "");
const auto data = demo_news_view(
*s.world, s.state, "inbox", "",
ui_preferences_.at("display").value("language", std::string("de")));
if (!data.value("ok", false))
return "";
const bool compact_preview =
+1
View File
@@ -0,0 +1 @@
{"source_commit":"7dbf70f5be5505af41fa532e37dd27aced86bd76","catalogue_sha256":"e249142f2635c897803d3016eb05d3f94297a75a013316fd536f82f2ef982339","description":"Synthetic own authored catalogue events and expected HTML-contract snapshots; no original game data.","cases":[{"name":"match-win:club:de","event":{"id":"demo:match-win:8a50928da6fcf6f9","type":"match.result","variant":"win","date":"2027-07-07","scope":{"kind":"club","id":"example-nordstadt","name":"FC Nordstadt"},"data":{"competition":{"id":"example-league","name":"Regionalliga","names":{"de":"Regionalliga","en":"Regional League"},"kind":"league"},"opponent":{"id":"example-hafen","name":"SV Hafenstadt","kind":"club"},"score":{"for":2,"against":1}},"demo":true},"context":{"language":"de"},"result":{"ok":true,"article":{"schema":"bmh-news-article@1","catalogueVersion":1,"id":"evt-1f772e4a07a5042c","eventId":"demo:match-win:8a50928da6fcf6f9","eventType":"match.result","templateId":"match-win","date":"2027-07-07","kind":"fixture","tone":"positive","scope":{"id":"example-nordstadt","name":"FC Nordstadt","kind":"club"},"dedupeKey":"[\"club\",\"example-nordstadt\",\"demo:match-win:8a50928da6fcf6f9\"]","fingerprint":"47ab160ae2128b71","event":{"id":"demo:match-win:8a50928da6fcf6f9","type":"match.result","date":"2027-07-07","scope":{"id":"example-nordstadt","name":"FC Nordstadt","kind":"club"},"data":{"competition":{"id":"example-league","name":"Regionalliga","kind":"league","names":{"de":"Regionalliga","en":"Regional League"}},"opponent":{"id":"example-hafen","name":"SV Hafenstadt","kind":"club"},"score":{"for":2,"against":1}},"variant":"win","templateId":"match-win","demo":true},"language":"de","headline":"Erfolg für FC Nordstadt","body":"FC Nordstadt gewinnt gegen SV Hafenstadt mit 2:1. Die Partie gehörte zu Regionalliga.","translations":{"de":{"headline":"Erfolg für FC Nordstadt","body":"FC Nordstadt gewinnt gegen SV Hafenstadt mit 2:1. Die Partie gehörte zu Regionalliga."},"en":{"headline":"Victory for FC Nordstadt","body":"FC Nordstadt beat SV Hafenstadt 2–1. The match was part of Regional League."}},"demo":true}}},{"name":"match-win:club:en","event":{"id":"demo:match-win:8a50928da6fcf6f9","type":"match.result","variant":"win","date":"2027-07-07","scope":{"kind":"club","id":"example-nordstadt","name":"FC Nordstadt"},"data":{"competition":{"id":"example-league","name":"Regionalliga","names":{"de":"Regionalliga","en":"Regional League"},"kind":"league"},"opponent":{"id":"example-hafen","name":"SV Hafenstadt","kind":"club"},"score":{"for":2,"against":1}},"demo":true},"context":{"language":"en"},"result":{"ok":true,"article":{"schema":"bmh-news-article@1","catalogueVersion":1,"id":"evt-1f772e4a07a5042c","eventId":"demo:match-win:8a50928da6fcf6f9","eventType":"match.result","templateId":"match-win","date":"2027-07-07","kind":"fixture","tone":"positive","scope":{"id":"example-nordstadt","name":"FC Nordstadt","kind":"club"},"dedupeKey":"[\"club\",\"example-nordstadt\",\"demo:match-win:8a50928da6fcf6f9\"]","fingerprint":"47ab160ae2128b71","event":{"id":"demo:match-win:8a50928da6fcf6f9","type":"match.result","date":"2027-07-07","scope":{"id":"example-nordstadt","name":"FC Nordstadt","kind":"club"},"data":{"competition":{"id":"example-league","name":"Regionalliga","kind":"league","names":{"de":"Regionalliga","en":"Regional League"}},"opponent":{"id":"example-hafen","name":"SV Hafenstadt","kind":"club"},"score":{"for":2,"against":1}},"variant":"win","templateId":"match-win","demo":true},"language":"en","headline":"Victory for FC Nordstadt","body":"FC Nordstadt beat SV Hafenstadt 2–1. The match was part of Regional League.","translations":{"de":{"headline":"Erfolg für FC Nordstadt","body":"FC Nordstadt gewinnt gegen SV Hafenstadt mit 2:1. Die Partie gehörte zu Regionalliga."},"en":{"headline":"Victory for FC Nordstadt","body":"FC Nordstadt beat SV Hafenstadt 2–1. The match was part of Regional League."}},"demo":true}}},{"name":"match-win:national:de","event":{"id":"demo:match-win:599266f6a6d2d79b","type":"match.result","variant":"win","date":"2027-07-07","scope":{"kind":"national","id":"national-de","name":"Deutschland","names":{"de":"Deutschland","en":"Germany"}},"data":{"competition":{"id":"example-international","name":"Länderspiel","names":{"de":"Länderspiel","en":"International Match"},"kind":"competition"},"opponent":{"kind":"national","id":"national-at","name":"Österreich","names":{"de":"Österreich","en":"Austria"}},"score":{"for":2,"against":1}},"demo":true},"context":{"language":"de"},"result":{"ok":true,"article":{"schema":"bmh-news-article@1","catalogueVersion":1,"id":"evt-d149e8841f861660","eventId":"demo:match-win:599266f6a6d2d79b","eventType":"match.result","templateId":"match-win","date":"2027-07-07","kind":"fixture","tone":"positive","scope":{"id":"national-de","name":"Deutschland","kind":"national","names":{"de":"Deutschland","en":"Germany"}},"dedupeKey":"[\"national\",\"national-de\",\"demo:match-win:599266f6a6d2d79b\"]","fingerpLine truncated
+237
View File
@@ -0,0 +1,237 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/news_catalog.hpp"
#include "modern/ui/news_journal.hpp"
#include <iostream>
#include <stdexcept>
#include <tuple>
#include <type_traits>
using namespace bmh::modern_ui;
namespace {
void require(bool yes, const std::string &message) {
if (!yes)
throw std::runtime_error(message);
}
void no(const Json &value, const std::string &code) {
require(!value.value("ok", false) && value.at("error").at("code") == code,
"Expected explicit " + code + ": " + value.dump());
}
} // namespace
int main(int argc, char **argv) {
try {
require(argc == 3, "Catalogue and synthetic reference paths required");
const auto catalog = NewsCatalog::load(argv[1]);
const auto reference = Json::parse(bmh::editor::read_file(argv[2]));
require(catalog.registry().size() == 113,
"113 own authored templates registered");
size_t passed = 0, mismatches = 0;
for (const auto &test : reference.at("cases")) {
const auto result =
catalog.from_event(test.at("event"), test.at("context"));
if (news_canonical(result) != news_canonical(test.at("result"))) {
++mismatches;
if (mismatches <= 4)
std::cerr << "Parity mismatch: " << test.at("name")
<< "\nActual: " << result.dump()
<< "\nExpected: " << test.at("result").dump() << '\n';
if (mismatches > 4)
std::cerr << "Additional mismatch " << test.at("name") << " actual "
<< result.value("article", Json::object())
.value("translations", Json())
<< "\n";
continue;
}
require(catalog.validate_article(result.at("article")).value("ok", false),
"Persisted bilingual snapshot validates");
++passed;
}
require(mismatches == 0, "Own HTML/native semantic contract mismatches: " +
std::to_string(mismatches));
for (const auto &t : catalog.registry()) {
auto fixture = catalog.example(t.at("id"));
require(fixture.value("ok", false),
"Explicit example available " + t.at("id").get<std::string>());
require(catalog.from_event(fixture.at("event")).value("ok", false),
"Explicit demo event validates " + t.at("id").get<std::string>());
for (const auto &[key, schema] : t.at("parameters").items()) {
auto absent = fixture.at("event");
if (schema.value("source", "") == "scope")
absent.erase("scope");
else
absent["data"].erase(key);
require(!catalog.from_event(absent).value("ok", false),
"Missing required field cannot invent facts: " + key);
auto bad = fixture.at("event");
if (schema.value("source", "") == "scope")
bad["scope"]["kind"] = "unknown";
else
bad["data"][key] = Json::array({"invalid"});
require(!catalog.from_event(bad).value("ok", false),
"Typed registry rejects malformed data: " + key);
}
}
auto event = catalog.example("transfer-signed").at("event");
const auto raw_event = event;
event["data"]["player"]["name"] = "Zoë Özdemir <img src=x> {{club}}";
const auto de = catalog.from_event(event),
en = catalog.from_event(event, {{"language", "en"}});
require(de.at("article").at("id") == en.at("article").at("id") &&
de.at("article").at("fingerprint") ==
en.at("article").at("fingerprint"),
"Locale cannot change occurrence identity");
require(de.at("article").at("body").get<std::string>().find(
"<img src=x> {{club}}") != std::string::npos,
"Payload is literal text, never markup or a second template");
auto detached = de.at("article");
event["data"]["player"]["name"] = "Renamed";
require(detached.at("body").get<std::string>().find("Zoë Özdemir") !=
std::string::npos,
"Article owns immutable original facts");
event = raw_event;
event["type"] = "unknown";
no(catalog.from_event(event), "unknown_news_event");
event = raw_event;
event["data"]["unknown"] = 1;
no(catalog.from_event(event), "unknown_news_parameter");
event = raw_event;
event["scope"]["kind"] = "national";
no(catalog.from_event(event), "unsupported_news_scope");
no(catalog.from_event(raw_event, {{"language", "xx"}}),
"invalid_news_context");
no(catalog.from_event(raw_event, {{"asOf", "2027-01-01"}}),
"future_news_event");
auto result = catalog.example("match-win").at("event");
result["data"]["score"] = {{"for", 0}, {"against", 2}};
no(catalog.from_event(result), "inconsistent_news_event");
event = raw_event;
event["data"]["fee"] = {
{"minor", "100"}, {"currency", "EUR"}, {"minorUnits", 0}};
no(catalog.from_event(event), "invalid_news_parameter");
event = raw_event;
event["data"]["player"]["name"] = std::string("bad\xc0\xaf");
no(catalog.from_event(event), "invalid_news_parameter");
for (const auto *id : {"transfer-fee-undisclosed", "sale-fee-undisclosed",
"contract-basic", "loan-end-undisclosed"}) {
event = catalog.example(id).at("event");
event.erase("variant");
const auto minimal = catalog.from_event(event);
require(minimal.value("ok", false) &&
minimal.at("article").at("templateId") == id,
"Absent fee/wage/end uses only known facts");
}
std::string error;
for (const auto &[precision, minor, expected] :
std::vector<std::tuple<int, std::string, int64_t>>{{0, "12", 1200},
{1, "12", 120},
{2, "12", 12},
{3, "120", 12},
{4, "1200", 12}}) {
auto money = news_money_from_dto(
{{"minor", minor}, {"currency", "EUR"}, {"minorUnits", precision}},
error);
require(money && money->minor == expected && error.empty(),
"Explicit exact DTO scaling");
}
for (const auto &value : Json::array(
{Json{{"minor", "125"}, {"currency", "EUR"}, {"minorUnits", 3}},
Json{{"minor", "-12"}, {"currency", "EUR"}, {"minorUnits", 2}},
Json{{"minor", "12"}, {"currency", "JPY"}, {"minorUnits", 0}},
Json{{"minor", "900000000000001"},
{"currency", "EUR"},
{"minorUnits", 2}},
Json{{"minor", 12}, {"currency", "EUR"}, {"minorUnits", 2}},
Json{{"minor", "12"}, {"currency", "EUR"}},
Json{{"minor", "0012"}, {"currency", "EUR"}, {"minorUnits", 2}}}))
require(!news_money_from_dto(value, error) && !error.empty(),
"Unknown/inexact/negative DTO units never silently convert");
static_assert(!std::is_convertible_v<int64_t, NewsMinorMoney>);
NewsEvent typed;
typed.id = "typed:arrival";
typed.type = "transfer.signed";
typed.date = "2027-07-07";
typed.scope = {NewsScopeKind::club, {"club:typed", "FC Typed", {}}};
typed.data = raw_event.at("data");
require(catalog.from_event(typed).value("ok", false),
"Typed semantic event API");
typed.scope.kind = static_cast<NewsScopeKind>(99);
no(catalog.from_event(typed), "invalid_news_event");
for (int bad_case = 0; bad_case < 4; ++bad_case) {
auto broken = catalog.data();
if (bad_case == 0)
broken["templates"][0]["parameters"]["score"]["type"] = "guessed";
if (bad_case == 1)
broken["templates"][0]["guards"] = Json::array({"unknown_rule"});
if (bad_case == 2)
broken["templates"][0]["de"]["headline"] = "{{undeclared}}";
if (bad_case == 3)
broken["templates"][1]["id"] = broken["templates"][0]["id"];
bool rejected = false;
try {
NewsCatalog invalid(broken);
} catch (...) {
rejected = true;
}
require(rejected, "Malformed typed registry rejected before rendering");
}
auto journal = empty_news_journal();
const auto article = catalog.from_event(raw_event).at("article");
const auto posted = publish_news_article(journal, catalog, article);
require(posted.value("ok", false) && !posted.at("deduped").get<bool>() &&
valid_news_journal(journal),
"Validated explicit publication");
const auto initial = journal;
require(
publish_news_article(
journal, catalog,
catalog.from_event(raw_event, {{"language", "en"}}).at("article"))
.at("deduped") == true &&
journal == initial,
"Locale replay cannot rewrite stored bilingual snapshot or create a "
"row");
require(publish_news_article(journal, catalog, article).at("deduped") ==
true &&
journal == initial,
"Replay is a write-free dedupe read");
journal["items"][0]["folder"] = "trash";
const auto deleted = journal;
auto restored = Json::parse(journal.dump());
require(publish_news_article(restored, catalog, article).at("deduped") ==
true &&
restored == deleted,
"Persisted deletion ledger survives reload and suppresses replay");
require(publish_news_article(journal, catalog, article).at("deduped") ==
true &&
journal == deleted,
"Delete/replay cannot resurrect or duplicate");
auto conflict = raw_event;
conflict["data"]["fee"]["minor"] = 1;
no(publish_news_article(journal, catalog,
catalog.from_event(conflict).at("article")),
"news_event_id_conflict");
require(journal == deleted, "Conflict has no partial publication");
require(!news_row_visible(initial.at("items")[0],
{{"kind", "national"}, {"id", "national-de"}}) &&
!news_row_visible(initial.at("items")[0],
{{"kind", "club"}, {"id", "other"}}),
"National/other club cannot see historical club finance/personnel");
require(news_row_text(initial.at("items")[0], "en").at("body") ==
article.at("translations").at("en").at("body"),
"Both immutable language snapshots are directly projected");
auto changed = catalog.data();
for (auto &t : changed["templates"])
if (t.at("id") == detached.at("templateId"))
t["de"]["headline"] = "Neue Formulierung";
NewsCatalog newer(changed);
require(newer.validate_article(detached).value("ok", false) &&
newer.validate_article(detached).at("article").at("headline") ==
detached.at("headline"),
"Wording edits never rewrite archived snapshots");
std::cout
<< "native press renderer: " << passed
<< " full parity cases plus registry/types/money/scope/dedupe passed\n";
return 0;
} catch (const std::exception &e) {
std::cerr << e.what() << '\n';
return 1;
}
}
+169 -4
View File
@@ -2,10 +2,13 @@
#include "modern/ui/demo_news.hpp"
#include "modern/ui/desktop.hpp"
#include "modern/ui/model.hpp"
#include "modern/ui/news_catalog.hpp"
#include "modern/ui/news_journal.hpp"
#include <chrono>
#include <iostream>
#include <set>
#include <stdexcept>
#include <tuple>
using namespace bmh::modern_ui;
namespace {
void require(bool yes, const char *why) {
@@ -89,12 +92,55 @@ void provider(Fixture &f) {
"Current manager and club not interpolated");
auto changed = s;
changed["managers"][0] = {{"name", "Other Manager"}, {"club", "club:news-1"}};
require(demo_news_view(*f.world, changed).at("items").empty() &&
demo_news_unread(changed) == 0,
"Other manager's club must not inherit or rename old club articles");
changed = s;
changed["managers"][0]["name"] = "Renamed Manager";
require(demo_news_view(*f.world, changed)
.at("items")[0]
.at("body")
.get<std::string>()
.find("Other Manager. Synthetic Club 1") != std::string::npos,
"Manager change retained stale template identity");
.find("Synthetic Manager. Synthetic Club 0") !=
std::string::npos,
"Historical owner text must never be rewritten by the current name");
auto national = s;
national["career"] = {{"role", "national"}, {"surface", "outdoor"}};
require(demo_news_view(*f.world, national).at("items").empty() &&
demo_news_unread(national) == 0 &&
demo_news_view(*f.world, national).at("club_name") ==
"Deutschland",
"National header must never expose club financial stories");
reject(national, {{"kind", "read"}, {"id", "season"}}, *f.world);
const auto national_before = national;
require(edit_demo_news(national, {{"kind", "read-all"}, {"folder", "inbox"}},
*f.world)
.empty() &&
national == national_before,
"National read-all must not alter hidden club rows");
auto legacy = s;
Json raw = Json::array();
for (const auto &item : s.at("news").at("items")) {
auto row = item;
row.erase("scope");
row.erase("owner");
raw.push_back(row);
}
raw[0]["body"] = "Hallo {{manager}}. {{club}}.";
legacy["news"] = {{"version", 1}, {"items", raw}};
const auto legacy_before = legacy;
require(demo_news_view(*f.world, legacy).at("items").empty() &&
legacy == legacy_before,
"Reading unbound v1 cannot guess owner or mutate state");
require(
migrate_demo_news(legacy, *f.world) &&
legacy.at("news").at("items").empty() &&
legacy.at("news").at("unbound") == raw &&
demo_news_view(*f.world, legacy).at("unbound_count") == 12,
"Ownerless old article facts remain intact in separate unbound storage");
const auto migrated = legacy;
require(migrate_demo_news(legacy, *f.world) && legacy == migrated,
"Conservative migration is idempotent");
require(demo_news_view(*f.world, s, "inbox", "FINANZEN").at("items").size() ==
2 &&
demo_news_view(*f.world, s, "inbox", "VERTRAGSGESPRÄCHE")
@@ -196,7 +242,7 @@ void provider(Fixture &f) {
invalid["news"]["query"] = "must-be-local";
bad.push_back(invalid);
invalid = initial;
for (int i = 12; i < 101; ++i) {
for (int i = 12; i < 501; ++i) {
auto m = invalid["news"]["items"][0];
m["id"] = "test-" + std::to_string(i);
invalid["news"]["items"].push_back(m);
@@ -289,12 +335,131 @@ void source(Fixture &f) {
base.erase("news");
require(rest == base, "Mailbox actions modified unrelated presentation data");
}
void accepted_start_identity(Fixture &f) {
DemoSource source(f.world);
Json options = {{"duration", 5}, {"difficulty", 3}, {"players", 1},
{"mode", 3}, {"league", true}, {"world", true}};
Json managers = Json::array({{{"name", "FreshCoach"},
{"club", "club:news-1"},
{"portrait", 4},
{"portrait_style", "painted"},
{"strength_choice", 1}}});
require(source
.apply({source.snapshot().revision,
"start",
{{"setup", options}, {"managers", managers}}})
.ok,
"Actual accepted new career start");
const auto original = source.snapshot().state.at("news");
require(original.at("items").size() == 12,
"Known club demo starts with existing journal fixtures");
for (const auto &row : original.at("items"))
require(row.at("scope").at("id") == "club:news-1" &&
row.at("owner").at("name") == "FreshCoach" &&
row.at("owner").at("id") == "portrait:4",
"New start freezes accepted person and nondefault club, never "
"fresh defaults");
require(original.at("items")[0].at("body").get<std::string>().find(
"FreshCoach. Synthetic Club 1") != std::string::npos,
"Actual start story uses confirmed identity");
managers[0]["name"] = "LaterName";
managers.push_back({{"name", "OtherCoach"},
{"club", "club:news-0"},
{"portrait", 1},
{"portrait_style", "photo"},
{"strength_choice", 1}});
require(source.apply({source.snapshot().revision, "managers", managers}).ok &&
source.snapshot().state.at("news") == original,
"Join/name updates cannot rewrite historical journal");
require(source.apply({source.snapshot().revision,
"career",
{{"kind", "role"}, {"value", "national"}}})
.ok &&
source.snapshot().state.at("news") == original &&
demo_news_unread(source.snapshot().state) == 0,
"Role change retains facts but hides club journal");
options["league"] = false;
managers = Json::array({managers[0]});
require(source.apply({source.snapshot().revision,
"start",
{{"setup", options}, {"managers", managers}}})
.ok &&
source.snapshot().state.at("news").at("items").empty(),
"National-only new start must not receive fresh club stories");
}
void write_fixtures(Fixture &f, const fs::path &out,
const fs::path &catalogue_path) {
fs::create_directories(out);
fs::copy(f.root / "world", out / "world",
fs::copy_options::recursive | fs::copy_options::overwrite_existing);
fs::copy_file(f.root / "manifest.json", out / "manifest.json",
fs::copy_options::overwrite_existing);
DemoSource source(f.world);
auto managers = source.snapshot().state.at("managers");
managers.push_back({{"name", "Mara König"},
{"club", "club:news-1"},
{"portrait", 1},
{"portrait_style", "painted"},
{"strength_choice", 1}});
require(source.apply({source.snapshot().revision, "managers", managers}).ok,
"Two-owner native scope fixture");
auto data = source.snapshot().state;
data["desktop"] = default_desktop();
const auto original = data;
const auto catalog = NewsCatalog::load(catalogue_path);
for (const auto &[template_id, scope, id] :
std::vector<std::tuple<std::string, Json, std::string>>{
{"injury-recovered",
{{"kind", "club"},
{"id", "club:news-0"},
{"name", "Synthetic Club 0"}},
"native:press:own"},
{"sponsor-signed",
{{"kind", "club"},
{"id", "club:news-1"},
{"name", "Synthetic Club 1"}},
"native:press:other"},
{"national-squad",
{{"kind", "national"},
{"id", "national-de"},
{"name", "Deutschland"},
{"names", {{"de", "Deutschland"}, {"en", "Germany"}}}},
"native:press:national"}}) {
const auto example = catalog.example(
template_id, {{"scope", scope}, {"date", data.at("date")}, {"id", id}});
require(example.value("ok", false),
"Explicit native catalogue demo fixture");
const auto built = catalog.from_event(example.at("event"));
require(built.value("ok", false), "Typed catalogue demo renders");
require(publish_news_article(data["news"], catalog, built.at("article"))
.value("ok", false),
"Demo fixture publication");
}
require(source.load_data(data) == default_desktop(), "Native fixture layout");
source.save(out / "scoped.json", default_desktop());
auto legacy = original;
legacy["news"] = {
{"version", 1},
{"items", Json::array({{{"id", "legacy-unknown"},
{"date", legacy.at("date")},
{"kind", "finance"},
{"title", "Altbestand {{club}}"},
{"body", "Unveränderte Meldung für {{manager}}. "
"Historischer Besitzer unbekannt."},
{"read", false},
{"folder", "inbox"}}})}};
// This intentionally old input is consumed by the normal native load path.
bmh::editor::write_atomic(out / "legacy.json", legacy.dump(2));
}
} // namespace
int main() {
int main(int argc, char **argv) {
try {
Fixture f;
provider(f);
source(f);
accepted_start_identity(f);
if (argc == 4 && std::string(argv[1]) == "--write-fixtures")
write_fixtures(f, argv[2], argv[3]);
std::cout << "modern news UI tests passed\n";
return 0;
} catch (const std::exception &e) {