From 99861eb37bf4080df02f25df4f89b032f77bbc44 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 14 Jan 2021 00:00:41 +0000 Subject: [PATCH] infopane: Plumbing for player list Signed-off-by: Ian Jackson --- daemon/session.rs | 4 ++++ src/global.rs | 8 ++++---- templates/macros.tera | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/daemon/session.rs b/daemon/session.rs index 29735b76..d78b139f 100644 --- a/daemon/session.rs +++ b/daemon/session.rs @@ -20,6 +20,7 @@ struct SessionRenderContext { sse_url_prefix: String, links: Html, scale: f64, + player_info_pane: Html, } #[derive(Debug,Serialize)] @@ -87,6 +88,8 @@ fn session_inner(form : Json, let mut uses = vec![]; let mut alldefs = vec![]; + let player_info_pane = ig.player_info_pane()?; + let mut load_players = HashMap::new(); for (player, _pl) in &ig.gs.players { let dataload = DataLoadPlayer::from_player(ig, player); @@ -196,6 +199,7 @@ fn session_inner(form : Json, scale: SVG_SCALE, nick: gpl.nick.clone(), sse_url_prefix, + player_info_pane, ptoken: form.ptoken.clone(), links: (&*ig.links).into(), load: serde_json::to_string(&DataLoad { diff --git a/src/global.rs b/src/global.rs index 0383c300..f873f1f8 100644 --- a/src/global.rs +++ b/src/global.rs @@ -408,9 +408,9 @@ impl Instance { } #[throws(InternalError)] - fn player_info_pane(&self) -> Arc { + pub fn player_info_pane(&self) -> Html { let html = Html::from_txt("Players list from server, but NYI");// xxx - Arc::new(html) + html } } @@ -528,7 +528,7 @@ impl<'ig> InstanceGuard<'ig> { self.c.g.iplayers.insert(player, record); let update = (||{ - let new_info_pane = self.player_info_pane()?; + let new_info_pane = Arc::new(self.player_info_pane()?); let update = PreparedUpdateEntry::AddPlayer { player, new_info_pane, @@ -652,7 +652,7 @@ impl<'ig> InstanceGuard<'ig> { swap_things(self); undo.push(Box::new(swap_things)); - let new_info_pane = self.player_info_pane()?; + let new_info_pane = Arc::new(self.player_info_pane()?); self.save_game_now().map_err(|e|{ // oof diff --git a/templates/macros.tera b/templates/macros.tera index 099c7696..20ccbf59 100644 --- a/templates/macros.tera +++ b/templates/macros.tera @@ -102,7 +102,7 @@ Hi {{nick | escape}} -- 2.30.2