fix mtxchat MenuOp::Room

This commit is contained in:
nworbnhoj 2023-08-30 04:48:05 +10:00
parent 2f157d5957
commit f9c9521c8a
2 changed files with 19 additions and 23 deletions

View file

@ -382,11 +382,6 @@ impl<'a> MtxChat<'a> {
// assume logged in, token is valid // assume logged in, token is valid
pub fn get_room_id(&mut self) -> Option<String> { pub fn get_room_id(&mut self) -> Option<String> {
let mut room = String::new(); let mut room = String::new();
if self.room_id.len() > 0 {
write!(room, "#{}:{}", &self.room_name, &self.room_domain)
.expect("failed to write room");
Some(room)
} else {
self.room_modal(); self.room_modal();
write!(room, "#{}:{}", &self.room_name, &self.room_domain) write!(room, "#{}:{}", &self.room_name, &self.room_domain)
.expect("failed to write room"); .expect("failed to write room");
@ -400,7 +395,6 @@ impl<'a> MtxChat<'a> {
None None
} }
} }
}
pub fn redraw(&self) { pub fn redraw(&self) {
self.chat.redraw(); self.chat.redraw();
@ -483,10 +477,9 @@ impl<'a> MtxChat<'a> {
return; return;
} }
if self.room_id.len() == 0 { if self.room_id.len() == 0 {
if self.get_room_id().is_none() { log::info!("No room id set");
return; return;
} }
}
if self.filter.len() == 0 { if self.filter.len() == 0 {
if !self.get_filter() { if !self.get_filter() {
return; return;
@ -568,10 +561,9 @@ impl<'a> MtxChat<'a> {
} }
} }
if self.room_id.len() == 0 { if self.room_id.len() == 0 {
if self.get_room_id().is_none() { log::info!("No room id set");
return; return;
} }
}
let txn_id = self.gen_txn_id(); let txn_id = self.gen_txn_id();
log::info!("txn_id = {}", txn_id); log::info!("txn_id = {}", txn_id);
let mut server = String::new(); let mut server = String::new();

View file

@ -129,7 +129,11 @@ fn wrapped_main() -> ! {
} }
Some(MenuOp::Noop) => {} Some(MenuOp::Noop) => {}
Some(MenuOp::Room) => { 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::Rawkeys) => log::info!("got mtxchat rawkeys"),
Some(MtxchatOp::Quit) => { Some(MtxchatOp::Quit) => {
log::error!("got Quit"); log::error!("got Quit");
chat.forward(msg); mtxchat.listen_over("");
break; break;
} }
_ => (), _ => (),