From: Ian Jackson Date: Sun, 1 May 2022 18:47:55 +0000 (+0100) Subject: Properly update desc in Recorded updates X-Git-Tag: otter-1.1.0~334 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=170d245c6cdb5bd01e6865338d09ebe2620717c6;p=otter.git Properly update desc in Recorded updates Signed-off-by: Ian Jackson --- diff --git a/apitest/atmain.rs b/apitest/atmain.rs index 0c6782bf..b093e55c 100644 --- a/apitest/atmain.rs +++ b/apitest/atmain.rs @@ -427,7 +427,7 @@ pub fn update_update_pieces( if k == "Recorded" { let p = p.unwrap(); - for k in ["zg", "svg"] { + for k in ["zg", "svg", "desc"] { p.info.set(k, &v[k]); } } else if k == "Piece" { diff --git a/src/updates.rs b/src/updates.rs index f6eba394..dca1b10f 100644 --- a/src/updates.rs +++ b/src/updates.rs @@ -251,6 +251,7 @@ enum TransmitUpdateEntry<'u> { cseq: ClientSequence, zg: Option, svg: Option<&'u Html>, // IsResponseToClientOp::UpdateSvg + desc: Option<&'u Html>, }, Piece(TransmitUpdateEntry_Piece<'u>), Image(TransmitUpdateEntry_Image<'u>), @@ -913,7 +914,11 @@ impl PreparedUpdate { let tue = match ftg { FTG::Recorded(cseq, ns) => { let zg = op.new_z_generation(); - TUE::Recorded { piece, cseq, zg, svg: ns.map(|ns| &ns.svg) } + TUE::Recorded { + piece, cseq, zg, + svg: ns.map(|ns| &ns.svg), + desc: ns.map(|ns| &ns.desc), + } }, FTG::Piece => TUE::Piece(pue_piece_to_tue_p(pue_p, player)?), FTG::Exactly(x) => x, diff --git a/templates/script.ts b/templates/script.ts index 3f75b1c1..e1a85639 100644 --- a/templates/script.ts +++ b/templates/script.ts @@ -2082,7 +2082,7 @@ function piece_set_zlevel_from(piece: PieceId, p: PieceInfo, messages.Recorded = function (j: { piece: PieceId, cseq: ClientSeq, - zg: Generation|null, svg: string | null } ) { + zg: Generation|null, svg: string | null, desc: string | null } ) { let piece = j.piece; let p = pieces[piece]!; piece_recorded_cseq(p, j); @@ -2102,6 +2102,9 @@ messages.Recorded = function p.zg = zg_new; }); } + if (j.desc != null) { + p.desc = j.desc; + } } function piece_recorded_cseq(p: PieceInfo, j: { cseq: ClientSeq }) {