client colors

This commit is contained in:
MeexReay 2025-02-09 15:39:44 +03:00
parent 8b9b870172
commit 46e1389617

View File

@ -114,12 +114,7 @@ fn on_message(message: String) -> String {
let message = message.replace("\0", ""); let message = message.replace("\0", "");
let message = message.replace("\t", ""); let message = message.replace("\t", "");
let captures = Regex::new(r"\[(.*?)\] <(.*?)> (.*)").unwrap().captures(&message) if let Some(captures) = Regex::new(r"\[(.*?)\] <(.*?)> (.*)").unwrap().captures(&message) {
.or_else(|| Regex::new(&format!("\\[(.*?)\\] {}<(.*?)> (.*)", MAGIC_KEY)).unwrap().captures(&message))
.or_else(|| Regex::new(&format!("\\[(.*?)\\] {} <(.*?)> (.*)", MAGIC_KEY)).unwrap().captures(&message))
.or_else(|| Regex::new(r"\[(.*?)\] (.*?): (.*)").unwrap().captures(&message));
if let Some(captures) = captures {
let date = &captures[1]; let date = &captures[1];
let nick = &captures[2]; let nick = &captures[2];
let content = &captures[3]; let content = &captures[3];
@ -130,6 +125,28 @@ fn on_message(message: String) -> String {
result.push_str(&format!("{}{}{}", color::Fg(color::White), style::Blink, content)); result.push_str(&format!("{}{}{}", color::Fg(color::White), style::Blink, content));
result.push_str(&style::Reset.to_string()); result.push_str(&style::Reset.to_string());
result result
} else if let Some(captures) = Regex::new(&format!("\\[(.*?)\\] {}<(.*?)> (.*)", MAGIC_KEY)).unwrap().captures(&message) {
let date = &captures[1];
let nick = &captures[2];
let content = &captures[3];
let mut result = String::new();
result.push_str(&format!("{}{}[{}] ", color::Fg(color::White), style::Faint, date));
result.push_str(&format!("{}{}{}<{}> ", style::Reset, style::Bold, color::Fg(color::Green), nick));
result.push_str(&format!("{}{}{}", color::Fg(color::White), style::Blink, content));
result.push_str(&style::Reset.to_string());
result
} else if let Some(captures) = Regex::new(r"\[(.*?)\] (.*?): (.*)").unwrap().captures(&message) {
let date = &captures[1];
let nick = &captures[2];
let content = &captures[3];
let mut result = String::new();
result.push_str(&format!("{}{}[{}] ", color::Fg(color::White), style::Faint, date));
result.push_str(&format!("{}{}{}<{}> ", style::Reset, style::Bold, color::Fg(color::LightMagenta), nick));
result.push_str(&format!("{}{}{}", color::Fg(color::White), style::Blink, content));
result.push_str(&style::Reset.to_string());
result
} else if let Some(captures) = Regex::new(r"\[(.*?)\] (.*)").unwrap().captures(&message) { } else if let Some(captures) = Regex::new(r"\[(.*?)\] (.*)").unwrap().captures(&message) {
let date = &captures[1]; let date = &captures[1];
let content = &captures[2]; let content = &captures[2];