From 2e95a4fcc50f3aa8d7028f1d47895ead1120b056 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 5 Jan 2021 23:58:20 +0000
Subject: [PATCH] log_did_to_piece nfc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 daemon/api.rs | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/daemon/api.rs b/daemon/api.rs
index d32ae983..2d10eb87 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -99,6 +99,18 @@ impl<'r> Responder<'r> for OnlineErrorResponse {
   }
 }
 
+fn log_did_to_piece<L: Lens + ?Sized>(
+  gpl: &GPlayerState, lens: &L, p: &dyn Piece, pc: &PieceState, piece: PieceId,
+  did: &str,
+) -> Vec<LogEntry> {
+  vec![ LogEntry { html: Html(format!(
+    "{} {} {}",
+    &htmlescape::encode_minimal(&gpl.nick),
+    did,
+    p.describe_pri(&lens.log_pri(piece, pc)).0
+  ))}]
+}
+
 #[throws(OE)]
 fn api_piece_op<O: ApiPieceOp>(form : Json<ApiPiece<O>>)
                    -> impl response::Responder<'static> {
@@ -357,12 +369,10 @@ impl ApiPieceOp for ApiPiecePin {
     let gpl = gs.players.byid(player).unwrap();
     pc.pinned = self.0;
     let update = PieceUpdateOp::Modify(());
-    let logents = vec![ LogEntry { html: Html(format!(
-      "{} {} {}",
-      &htmlescape::encode_minimal(&gpl.nick),
+    let logents = log_did_to_piece(
+      &gpl, lens, p, pc, piece,
       if pc.pinned { "pinned" } else { "unpinned" },
-      p.describe_pri(&lens.log_pri(piece, pc)).0
-    ))}];
+    );
     (WhatResponseToClientOp::Predictable,
      update, logents)
   }
-- 
2.30.2