From 9629748b6d82dd1b0dc7ff2a909a8ba8e87cd8fe Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 29 Mar 2021 01:44:46 +0100
Subject: [PATCH] pass player nick to client

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 src/updates.rs      | 13 ++++++++++---
 templates/script.ts |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/updates.rs b/src/updates.rs
index 7b7cdba8..bb1cec35 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -128,6 +128,7 @@ pub struct PreparedPieceImage {
 #[derive(Serialize,Debug)]
 pub struct DataLoadPlayer {
   dasharray: Html,
+  nick: Html,
 }
 
 pub trait JsonLen {
@@ -409,10 +410,11 @@ impl PreparedUpdateEntry {
       }
       AddPlayer {
         player:_,
-        data: DataLoadPlayer { dasharray },
+        data: DataLoadPlayer { dasharray, nick, },
         new_info_pane,
       } => {
-        dasharray.0.as_bytes().len() + 100
+        dasharray.0.as_bytes().len() +
+        nick     .0.as_bytes().len() + 100
           + new_info_pane.0.len()
       }
       RemovePlayer { player:_, new_info_pane } => {
@@ -441,9 +443,14 @@ impl PreparedUpdateEntry {
 
 impl DataLoadPlayer {
   pub fn from_player(ig: &Instance, player: PlayerId) -> Self {
-    let dasharray = player_dasharray(&ig.gs.players, player);
+    let gplayers = &ig.gs.players;
+    let dasharray = player_dasharray(gplayers, player);
+    let nick = gplayers.get(player).map(|gpl| gpl.nick.as_str())
+      .unwrap_or("<unknown-player>");
+    let nick = Html(htmlescape::encode_minimal(&nick));
     DataLoadPlayer {
       dasharray,
+      nick,
     }
   }
 }
diff --git a/templates/script.ts b/templates/script.ts
index 165e5e10..039e19eb 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -144,6 +144,7 @@ const uo_kind_prec : { [kind: string]: number } = {
 
 type PlayerInfo = {
   dasharray : string,
+  nick: string,
 }
 var players : { [player: string]: PlayerInfo };
 
-- 
2.30.2