Skip to content

Commit 428ecd5

Browse files
committed
优化:增加时间戳格式化函数,优化禁言用户列表输出格式
1 parent c9a23f5 commit 428ecd5

2 files changed

Lines changed: 17 additions & 9 deletions

File tree

client/src/commands/handlers/chatroom.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::{
55
},
66
ui::{CommandCompleter, CommandItem, CrosstermInputHandler},
77
utils::{
8-
filter_tail_content, format_quote_message, is_quote_message, strip_html_tags_chatroom, format_reply_message
8+
filter_tail_content, format_quote_message, is_quote_message, strip_html_tags_chatroom, format_reply_message, format_timestamp_millis
99
},
1010
};
1111
use lru::LruCache;
@@ -690,10 +690,10 @@ impl ChatroomCommand {
690690
println!("禁言用户列表 ({}人):", mutes.len());
691691
for (i, mute) in mutes.iter().enumerate() {
692692
println!(
693-
" {}. {} - 时间: {}",
693+
" {}. {} - 禁言至: {}",
694694
i + 1,
695695
mute.user_name.red(),
696-
mute.time.to_string().yellow()
696+
format_timestamp_millis(mute.time).to_string().yellow()
697697
);
698698
}
699699
}
@@ -765,30 +765,30 @@ impl ChatroomCommand {
765765
if is_sender {
766766
match money {
767767
m if m < 0 => println!(
768-
" 🎉 你出 {} 赢了 {} 积分!",
768+
"\r 🎉 你出 {} 赢了 {} 积分!",
769769
gesture_name.yellow(),
770770
m.abs().to_string().cyan().bold()
771771
),
772772
m if m > 0 => println!(
773-
" 💔 你出 {} 输了 {} 积分!",
773+
"\r 💔 你出 {} 输了 {} 积分!",
774774
gesture_name.yellow(),
775775
m.to_string().cyan().bold()
776776
),
777-
_ => println!(" 🤝 你出 {} 平局!", gesture_name.yellow()),
777+
_ => println!("\r 🤝 你出 {} 平局!", gesture_name.yellow()),
778778
}
779779
} else {
780780
match money {
781781
m if m > 0 => println!(
782-
" 🎉 你出 {} 赢了 {} 积分!",
782+
"\r 🎉 你出 {} 赢了 {} 积分!",
783783
gesture_name.yellow(),
784784
m.to_string().cyan().bold()
785785
),
786786
m if m < 0 => println!(
787-
" 💔 你出 {} 输了 {} 积分!",
787+
"\r 💔 你出 {} 输了 {} 积分!",
788788
gesture_name.yellow(),
789789
m.abs().to_string().cyan().bold()
790790
),
791-
_ => println!(" 🤝 你出 {} 平局!", gesture_name.yellow()),
791+
_ => println!("\r 🤝 你出 {} 平局!", gesture_name.yellow()),
792792
}
793793
}
794794
}

client/src/utils/mod.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ pub mod auth;
22

33
pub use auth::AuthService;
44

5+
use chrono::{Local, TimeZone};
56
use colored::*;
67
use regex::Regex;
78

@@ -143,3 +144,10 @@ pub fn format_reply_message(message_id: &str, reply_content: &str, original_cont
143144
)
144145
}
145146
}
147+
148+
pub fn format_timestamp_millis(ts: i64) -> String {
149+
match Local.timestamp_millis_opt(ts) {
150+
chrono::LocalResult::Single(dt) => dt.format("%Y-%m-%d %H:%M:%S").to_string(),
151+
_ => "无效时间".to_string(),
152+
}
153+
}

0 commit comments

Comments
 (0)