mirror of
https://github.com/MeexReay/bRAC.git
synced 2025-05-06 13:38:04 +03:00
format_message remove context
This commit is contained in:
parent
17b2511217
commit
7bf88324e2
@ -208,7 +208,7 @@ pub fn on_send_message(ctx: Arc<Context>, message: &str) -> Result<(), Box<dyn E
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn format_message(ctx: Arc<Context>, message: String) -> Option<String> {
|
||||
pub fn format_message(enable_ip_viewing: bool, message: String) -> Option<String> {
|
||||
let message = sanitize_text(&message);
|
||||
|
||||
let date = DATE_REGEX.captures(&message)?;
|
||||
@ -230,7 +230,7 @@ pub fn format_message(ctx: Arc<Context>, message: String) -> Option<String> {
|
||||
.trim()
|
||||
.to_string()+" ";
|
||||
|
||||
let prefix = if ctx.enable_ip_viewing {
|
||||
let prefix = if enable_ip_viewing {
|
||||
if let Some(ip) = ip {
|
||||
format!("{}{} [{}]", ip, " ".repeat(if 15 >= ip.chars().count() {15-ip.chars().count()} else {0}), date)
|
||||
} else {
|
||||
|
@ -27,7 +27,7 @@ pub fn run_main_loop(ctx: Arc<Context>) {
|
||||
let messages: Vec<String> = if ctx.disable_formatting {
|
||||
messages
|
||||
} else {
|
||||
messages.into_iter().flat_map(|o| format_message(ctx.clone(), o)).collect()
|
||||
messages.into_iter().flat_map(|o| format_message(ctx.enable_ip_viewing, o)).collect()
|
||||
};
|
||||
|
||||
if ctx.enable_chunked {
|
||||
|
@ -326,7 +326,7 @@ pub fn recv_tick(ctx: Arc<Context>) -> Result<(), Box<dyn Error>> {
|
||||
let messages: Vec<String> = if ctx.disable_formatting {
|
||||
messages
|
||||
} else {
|
||||
messages.into_iter().flat_map(|o| format_message(ctx.clone(), o)).collect()
|
||||
messages.into_iter().flat_map(|o| format_message(ctx.enable_ip_viewing, o)).collect()
|
||||
};
|
||||
|
||||
if ctx.enable_chunked {
|
||||
|
Loading…
Reference in New Issue
Block a user