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,23 +382,17 @@ impl<'a> MtxChat<'a> {
// assume logged in, token is valid
pub fn get_room_id(&mut self) -> Option<String> {
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);

View file

@ -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;
}
_ => (),