fix ChatOp::PostAdd to default correctly to dialogue_key set by ChatOp::DialogueSet

This commit is contained in:
nworbnhoj 2023-11-30 07:24:58 +11:00
parent 7e485885b7
commit ffa3d56af4

View file

@ -354,7 +354,7 @@ pub fn server(
log::info!("my PID is {}", xous::process::id()); 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 ui = ui::Ui::new(sid, app_name, app_menu, app_cid, opcode_event);
let mut dialogue_key = None;
let mut allow_redraw = false; let mut allow_redraw = false;
loop { loop {
let msg = xous::receive_message(sid).unwrap(); let msg = xous::receive_message(sid).unwrap();
@ -408,7 +408,7 @@ pub fn server(
let buffer = let buffer =
unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
let dialogue = buffer.to_original::<Dialogue, _>().unwrap(); let dialogue = buffer.to_original::<Dialogue, _>().unwrap();
let dialogue_key = match dialogue.key { dialogue_key = match dialogue.key {
Some(key) => Some(key.to_string()), Some(key) => Some(key.to_string()),
None => None, None => None,
}; };
@ -526,12 +526,14 @@ pub fn server(
} }
Some(ChatOp::PostAdd) => { Some(ChatOp::PostAdd) => {
log::info!("ChatOp::PostAdd"); log::info!("ChatOp::PostAdd");
match dialogue_key {
Some(ref dialogue_id) => {
let buffer = let buffer =
unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) }; unsafe { Buffer::from_memory_message(msg.body.memory_message().unwrap()) };
match buffer.to_original::<api::Post, _>() { match buffer.to_original::<api::Post, _>() {
Ok(post) => ui Ok(post) => ui
.post_add( .post_add(
post.dialogue_id.as_str().unwrap(), &dialogue_id,
post.author.as_str().unwrap(), post.author.as_str().unwrap(),
post.timestamp, post.timestamp,
post.text.as_str().unwrap(), post.text.as_str().unwrap(),
@ -541,6 +543,9 @@ pub fn server(
Err(e) => log::warn!("failed to deserialize Post: {:?}", e), Err(e) => log::warn!("failed to deserialize Post: {:?}", e),
} }
} }
None => log::warn!("failed to PostAdd with Dialogue == None"),
}
}
Some(ChatOp::PostDel) => { Some(ChatOp::PostDel) => {
xous::msg_scalar_unpack!(msg, index, _, _, _, { xous::msg_scalar_unpack!(msg, index, _, _, _, {
log::info!("ChatOp::PostDel {index}"); log::info!("ChatOp::PostDel {index}");