MeexReay/bRAC
1
0
Fork 0
mirror of https://github.com/MeexReay/bRAC.git synced 2025-05-06 13:38:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

minimal chat fix

Browse Source
This commit is contained in:
MeexReay 2025-04-16 20:11:47 +03:00
parent 13a45d9562
commit bc42d8815b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/chat/minimal_tui.rs
View File

@ -1,4 +1,4 @@
use std::sync::Arc; use std::sync::{Arc, RwLock};
use std::io::stdout; use std::io::stdout;
use std::io::Write; use std::io::Write;
use std::error::Error; use std::error::Error;
@ -10,7 +10,7 @@ use super::{
config::Context, config::Context,
proto::{connect, read_messages}, proto::{connect, read_messages},
util::get_input util::get_input
}, format_message, on_send_message }, format_message, on_send_message, ChatStorage, set_chat
}; };
pub struct ChatContext { pub struct ChatContext {
@ -19,7 +19,7 @@ pub struct ChatContext {
} }
fn update_console(ctx: Arc<Context>) -> Result<(), Box<dyn Error>> { fn update_console(ctx: Arc<Context>) -> Result<(), Box<dyn Error>> {
let messages = ctx.messages.messages(); let messages = ctx.chat().messages.messages();
let mut out = stdout().lock(); let mut out = stdout().lock();
write!( write!(
@ -55,7 +55,7 @@ pub fn run_main_loop(ctx: Arc<Context>) {
match read_messages( match read_messages(
&mut stream, &mut stream,
ctx.max_messages, ctx.max_messages,
ctx.messages.packet_size(), ctx.chat().messages.packet_size(),
!ctx.enable_ssl, !ctx.enable_ssl,
ctx.enable_chunked ctx.enable_chunked
) { ) {
@ -67,21 +67,21 @@ pub fn run_main_loop(ctx: Arc<Context>) {
}; };
if ctx.enable_chunked { if ctx.enable_chunked {
ctx.messages.append_and_store(ctx.max_messages, messages.clone(), size); ctx.chat().messages.append_and_store(ctx.max_messages, messages.clone(), size);
} else { } else {
ctx.messages.update(ctx.max_messages, messages.clone(), size); ctx.chat().messages.update(ctx.max_messages, messages.clone(), size);
} }
} }
Err(e) => { Err(e) => {
let msg = format!("Read messages error: {}", e.to_string()).bright_red().to_string(); let msg = format!("Read messages error: {}", e.to_string()).bright_red().to_string();
ctx.messages.append(ctx.max_messages, vec![msg]); ctx.chat().messages.append(ctx.max_messages, vec![msg]);
} }
_ => {} _ => {}
} }
}, },
Err(e) => { Err(e) => {
let msg = format!("Connect error: {}", e.to_string()).bright_red().to_string(); let msg = format!("Connect error: {}", e.to_string()).bright_red().to_string();
ctx.messages.append(ctx.max_messages, vec![msg]); ctx.chat().messages.append(ctx.max_messages, vec![msg]);
} }
} }
@ -90,7 +90,7 @@ pub fn run_main_loop(ctx: Arc<Context>) {
if let Some(message) = get_input("") { if let Some(message) = get_input("") {
if let Err(e) = on_send_message(ctx.clone(), &message) { if let Err(e) = on_send_message(ctx.clone(), &message) {
let msg = format!("Send message error: {}", e.to_string()).bright_red().to_string(); let msg = format!("Send message error: {}", e.to_string()).bright_red().to_string();
ctx.messages.append(ctx.max_messages, vec![msg]); ctx.chat().messages.append(ctx.max_messages, vec![msg]);
} }
} }
} }