From f9c9521c8af27b29d391bf2c3dd577969297def5 Mon Sep 17 00:00:00 2001 From: nworbnhoj Date: Wed, 30 Aug 2023 04:48:05 +1000 Subject: [PATCH] fix mtxchat MenuOp::Room --- apps/mtxchat/src/lib.rs | 34 +++++++++++++--------------------- apps/mtxchat/src/main.rs | 8 ++++++-- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/apps/mtxchat/src/lib.rs b/apps/mtxchat/src/lib.rs index dba6bd483..d080e9f63 100644 --- a/apps/mtxchat/src/lib.rs +++ b/apps/mtxchat/src/lib.rs @@ -382,23 +382,17 @@ impl<'a> MtxChat<'a> { // assume logged in, token is valid pub fn get_room_id(&mut self) -> Option { let mut room = String::new(); - if self.room_id.len() > 0 { - write!(room, "#{}:{}", &self.room_name, &self.room_domain) - .expect("failed to write room"); + self.room_modal(); + write!(room, "#{}:{}", &self.room_name, &self.room_domain) + .expect("failed to write room"); + let mut server = String::new(); + write!(server, "{}{}", HTTPS, &self.user_domain).expect("failed to write server"); + if let Some(room_id) = web::get_room_id(&server, &room, &self.token) { + self.set_debug(ROOM_ID_KEY, &room_id); Some(room) } else { - self.room_modal(); - write!(room, "#{}:{}", &self.room_name, &self.room_domain) - .expect("failed to write room"); - let mut server = String::new(); - write!(server, "{}{}", HTTPS, &self.user_domain).expect("failed to write server"); - if let Some(room_id) = web::get_room_id(&server, &room, &self.token) { - self.set_debug(ROOM_ID_KEY, &room_id); - Some(room) - } else { - log::warn!("failed to return room_id"); - None - } + log::warn!("failed to return room_id"); + None } } @@ -483,9 +477,8 @@ impl<'a> MtxChat<'a> { return; } if self.room_id.len() == 0 { - if self.get_room_id().is_none() { - return; - } + log::info!("No room id set"); + return; } if self.filter.len() == 0 { if !self.get_filter() { @@ -568,9 +561,8 @@ impl<'a> MtxChat<'a> { } } if self.room_id.len() == 0 { - if self.get_room_id().is_none() { - return; - } + log::info!("No room id set"); + return; } let txn_id = self.gen_txn_id(); log::info!("txn_id = {}", txn_id); diff --git a/apps/mtxchat/src/main.rs b/apps/mtxchat/src/main.rs index f42e9a6c9..0b7ea6ef3 100644 --- a/apps/mtxchat/src/main.rs +++ b/apps/mtxchat/src/main.rs @@ -129,7 +129,11 @@ fn wrapped_main() -> ! { } Some(MenuOp::Noop) => {} Some(MenuOp::Room) => { - mtxchat.room_modal(); + if let Some(room) = mtxchat.get_room_id() { + mtxchat.listen_over(""); + mtxchat.dialogue_set(Some(room.as_str())); + mtxchat.listen(); + } } _ => (), } @@ -149,7 +153,7 @@ fn wrapped_main() -> ! { Some(MtxchatOp::Rawkeys) => log::info!("got mtxchat rawkeys"), Some(MtxchatOp::Quit) => { log::error!("got Quit"); - chat.forward(msg); + mtxchat.listen_over(""); break; } _ => (),