movehist: Show on reload

Move the data from Session to DataLoad where it should have been all
alone, and actually use it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/session.rs b/daemon/session.rs
index 29af633697e03a068be24f87fc9462ff062d6f9c..8ddda535a95762cf2f05c7757673e84b4e7053a0 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -24,7 +24,6 @@ struct SessionRenderContext {
   links: Html,
   player_info_pane: Html,
   fake_rng: bool,
-  movehist: movehist::PlHist,
 }
 
 #[derive(Debug,Serialize)]
@@ -58,6 +57,7 @@ struct DataLoad {
   last_log_ts: String,
   players: HashMap<PlayerId, DataLoadPlayer>,
   held_surround_colour: &'static str,
+  movehist: movehist::PlHist,
 }
 
 #[derive(Deserialize)]
@@ -229,13 +229,13 @@ fn session_inner(form: Json<SessionForm>,
       space_attrs: space_table_attrs(table_size).to_html(),
       rect_attrs: space_table_attrs(table_size).to_html(),
       nick,
-      movehist,
       sse_url_prefix,
       player_info_pane,
       ptoken: form.ptoken.clone(),
       links: (&*ig.links).into(),
       fake_rng: config().game_rng.is_fake(),
       load: serde_json::to_string(&DataLoad {
+        movehist,
         players: load_players,
         last_log_ts: timestamp_abbrev.unwrap_or_default(),
         held_surround_colour: HELD_SURROUND_COLOUR,

diff --git a/templates/script.ts b/templates/script.ts
index fc3af686d44637cc0abec3a9982dcce6774ab9a5..478a1accda85061ac28f2a78acd41efd7a9c9786 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -1529,6 +1529,10 @@ function startup() {
 
   last_log_ts = wasm_bindgen.timestamp_abbreviator(dataload.last_log_ts);
 
+  for (let ent of dataload.movehist.hist) {
+    movehist_record(ent);
+  }
+
   var es = new EventSource(
     sse_url_prefix + "/_/updates?ctoken="+ctoken+'&gen='+gen
   );