From ffa3d56af425e65f7efd802694279498d27095f4 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Thu, 30 Nov 2023 07:24:58 +1100 Subject: [PATCH] fix ChatOp::PostAdd to default correctly to dialogue_key set by ChatOp::DialogueSet --- libs/chat/src/lib.rs | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/libs/chat/src/lib.rs b/libs/chat/src/lib.rs index 52fc28563..d5f6e5834 100644 --- a/libs/chat/src/lib.rs +++ b/libs/chat/src/lib.rs @@ -354,7 +354,7 @@ pub fn server( log::info!("my PID is {}", xous::process::id()); let mut ui = ui::Ui::new(sid, app_name, app_menu, app_cid, opcode_event); - + let mut dialogue_key = None; let mut allow_redraw = false; loop { let msg = xous::receive_message(sid).unwrap(); @@ -408,7 +408,7 @@ pub fn server( let buffer = unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; let dialogue = buffer.to_original::().unwrap(); - let dialogue_key = match dialogue.key { + dialogue_key = match dialogue.key { Some(key) => Some(key.to_string()), None => None, }; @@ -526,19 +526,24 @@ pub fn server( } Some(ChatOp::PostAdd) => { log::info!("ChatOp::PostAdd"); - let buffer = - unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; - match buffer.to_original::() { - Ok(post) => ui - .post_add( - post.dialogue_id.as_str().unwrap(), - post.author.as_str().unwrap(), - post.timestamp, - post.text.as_str().unwrap(), - None, // TODO implement - ) - .unwrap(), - Err(e) => log::warn!("failed to deserialize Post: {:?}", e), + match dialogue_key { + Some(ref dialogue_id) => { + let buffer = + unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; + match buffer.to_original::() { + Ok(post) => ui + .post_add( + &dialogue_id, + post.author.as_str().unwrap(), + post.timestamp, + post.text.as_str().unwrap(), + None, // TODO implement + ) + .unwrap(), + Err(e) => log::warn!("failed to deserialize Post: {:?}", e), + } + } + None => log::warn!("failed to PostAdd with Dialogue == None"), } } Some(ChatOp::PostDel) => {