From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Feb 2021 14:04:22 +0000 (+0000)
Subject: hand: Centralise nick
X-Git-Tag: otter-0.4.0~312
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0e84c5946baf0bb89148ffee0d7fe250c16888cf;p=otter.git

hand: Centralise nick

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

diff --git a/src/hand.rs b/src/hand.rs
index 0a00b9f5..1fd5f873 100644
--- a/src/hand.rs
+++ b/src/hand.rs
@@ -141,12 +141,12 @@ impl PieceTrait for Hand {
 
     let dasharray = player_dasharray(gplayers, player);
     let gpl = gplayers.byid_mut(player)?;
+    let nick = Html(htmlescape::encode_minimal(&gpl.nick));
 
     let did;
     let new_owner;
     match (opname, xdata.owner.is_some()) {
       ("claim", false) => {
-        let nick = Html(htmlescape::encode_minimal(&gpl.nick));
         let new_desc = Html(format!("{}'s hand", &nick.0));
         new_owner = Some(MagicOwner {
           player,
@@ -170,8 +170,7 @@ impl PieceTrait for Hand {
       }
     }
 
-    let who_by = Html(htmlescape::encode_minimal(&gpl.nick));
-    let log = vec![ LogEntry { html: Html(format!("{} {}", who_by.0, did)) }];
+    let log = vec![ LogEntry { html: Html(format!("{} {}", nick.0, did)) }];
 
     xdata.owner = new_owner;