From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 12 Feb 2021 01:22:50 +0000 (+0000)
Subject: provide log_did_to_piece_whoby, nfc
X-Git-Tag: otter-0.4.0~538
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=10415547890b273b5147e0dd2b8c4559e7994e2a;p=otter.git

provide log_did_to_piece_whoby, nfc

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 59f3ec6a..f4c86df3 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -83,20 +83,32 @@ impl<'r> Responder<'r> for OnlineErrorResponse {
   }
 }
 
-fn log_did_to_piece(
+fn log_did_to_piece_whoby(
   occults: &GameOccults,
   player: PlayerId,
   gpl: &mut GPlayerState,
   piece: PieceId, pc: &PieceState, p: &dyn Piece,
   did: &str,
-) -> Vec<LogEntry> {
+) -> (Vec<LogEntry>, Html) {
+  let who_by = Html(htmlescape::encode_minimal(&gpl.nick));
   let pri = piece_pri(occults, player, gpl, piece, pc);
-  vec![ LogEntry { html: Html(format!(
+  let log = vec![ LogEntry { html: Html(format!(
     "{} {} {}",
-    &htmlescape::encode_minimal(&gpl.nick),
+    &who_by.0,
     did,
     p.describe_pri(&pri).0
-  ))}]
+  ))}];
+  (log, who_by)
+}
+
+fn log_did_to_piece(
+  occults: &GameOccults,
+  player: PlayerId,
+  gpl: &mut GPlayerState,
+  piece: PieceId, pc: &PieceState, p: &dyn Piece,
+  did: &str,
+) -> Vec<LogEntry> {
+  log_did_to_piece_whoby(occults,player,gpl,piece,pc,p,did).0
 }
 
 #[throws(OE)]