From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 13 Feb 2021 22:33:40 +0000 (+0000)
Subject: api: make log_did_to_piece public
X-Git-Tag: otter-0.4.0~499
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=358a2ab0396c8a1a1233594cb266c8bf5d545281;p=otter.git

api: make log_did_to_piece public

NFC

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

diff --git a/daemon/api.rs b/daemon/api.rs
index 4c9608fc..18492240 100644
--- a/daemon/api.rs
+++ b/daemon/api.rs
@@ -83,34 +83,6 @@ impl<'r> Responder<'r> for OnlineErrorResponse {
   }
 }
 
-fn log_did_to_piece_whoby(
-  occults: &GameOccults,
-  player: PlayerId,
-  gpl: &mut GPlayerState,
-  piece: PieceId, pc: &PieceState, p: &dyn Piece,
-  did: &str,
-) -> (Vec<LogEntry>, Html) {
-  let who_by = Html(htmlescape::encode_minimal(&gpl.nick));
-  let pri = piece_pri(occults, player, gpl, piece, pc);
-  let log = vec![ LogEntry { html: Html(format!(
-    "{} {} {}",
-    &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)]
 fn api_piece_op<O: ApiPieceOp>(form: Json<ApiPiece<O>>)
                    -> impl response::Responder<'static> {
diff --git a/src/updates.rs b/src/updates.rs
index 3c990022..016ab3d6 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -188,6 +188,36 @@ struct FormattedLogEntry<'u> {
 
 // ========== implementation ==========
 
+// ---------- helpful utilities ----------
+
+pub fn log_did_to_piece_whoby(
+  occults: &GameOccults,
+  player: PlayerId,
+  gpl: &mut GPlayerState,
+  piece: PieceId, pc: &PieceState, p: &dyn Piece,
+  did: &str,
+) -> (Vec<LogEntry>, Html) {
+  let who_by = Html(htmlescape::encode_minimal(&gpl.nick));
+  let pri = piece_pri(occults, player, gpl, piece, pc);
+  let log = vec![ LogEntry { html: Html(format!(
+    "{} {} {}",
+    &who_by.0,
+    did,
+    p.describe_pri(&pri).0
+  ))}];
+  (log, who_by)
+}
+
+pub 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
+}
+
 // ---------- prepared updates, queued in memory ----------
 
 pub struct PlayerUpdatesBuildContext {