From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 5 Jul 2020 11:54:29 +0000 (+0100)
Subject: nick on page
X-Git-Tag: otter-0.2.0~1452
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8ab99de68d162aa16e4d60ff71b2e23a2681039e;p=otter.git

nick on page
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 7a708d09..aa14a22d 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -56,6 +56,7 @@ struct SessionRenderContext {
   gen : Generation,
   defs : Vec<String>,
   uses : Vec<String>,
+  nick : String,
 }
 
 #[derive(Deserialize)]
@@ -69,7 +70,8 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
   let player = iad.ident;
   let c = {
     let mut ig = iad.g.lock()?;
-    let _pl = ig.gs.players.byid_mut(player)?;
+    let ig = &mut *ig;
+    let pl = ig.gs.players.byid_mut(player)?;
     let cl = Client { player };
     let client = ig.clients.insert(cl);
 
@@ -114,6 +116,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,OE> {
       player,
       defs,
       uses,
+      nick : pl.nick.clone(),
     }
   };
   Ok(Template::render("test",&c))
diff --git a/templates/test.tera b/templates/test.tera
index 577b9729..acb07526 100644
--- a/templates/test.tera
+++ b/templates/test.tera
@@ -3,7 +3,7 @@
       data-us="{{player}}"
       data-gen="{{gen}}"
       >
-<h1>Hi!</h1>
+<h1>Hi {{nick}}!</h1>
 <div id="error"></div>
 <p>
 <div id="status">nothing</div>