From 45ee8dc7c7764a8ed0adcfe4ced9d505509beaf5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Jan 2021 00:06:20 +0000 Subject: [PATCH] log_did_to_piece nfc Signed-off-by: Ian Jackson --- daemon/api.rs | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/daemon/api.rs b/daemon/api.rs index 7476633a..3bbc8442 100644 --- a/daemon/api.rs +++ b/daemon/api.rs @@ -203,15 +203,10 @@ impl ApiPieceOp for ApiPieceGrab { pc.held = Some(player); let update = PieceUpdateOp::ModifyQuiet(()); - - let logent = LogEntry { - html : Html(format!("{} grasped {}", - &htmlescape::encode_minimal(&gpl.nick), - p.describe_pri(&lens.log_pri(piece, pc)).0)), - }; + let logents = log_did_to_piece(gpl, lens, piece, pc, p, "grasped"); (WhatResponseToClientOp::Predictable, - update, vec![logent]) + update, logents) } } @@ -274,15 +269,10 @@ impl ApiPieceOp for ApiPieceUngrab { pc.held = None; let update = PieceUpdateOp::Modify(()); - - let logent = LogEntry { - html : Html(format!("{} released {}", - &htmlescape::encode_minimal(&gpl.nick), - p.describe_pri(&lens.log_pri(piece, pc)).0)), - }; + let logents = log_did_to_piece(gpl, lens, piece, pc, p, "released"); (WhatResponseToClientOp::Predictable, - update, vec![logent]) + update, logents) } } @@ -403,11 +393,8 @@ impl ApiPieceOp for ApiPieceUo { return ( wrc, PieceUpdateOp::Modify(()), - vec![ LogEntry { html: Html(format!( - "{} flipped {}", - &htmlescape::encode_minimal(&gpl.nick), - p.describe_pri(&lens.log_pri(piece, pc)).0 - )) }]) + log_did_to_piece(gpl, lens, piece, pc, p, "flipped"), + ) }, _ => break, -- 2.30.2