mii/rs-docker-bot
1
0
Fork 0
mirror of https://github.com/mii443/rs-docker-bot.git synced 2025-08-22 16:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

add path regex, remove slow print

Browse Source
This commit is contained in:
mii443
2024-10-09 05:59:50 +00:00
parent faaf7c8aa9
commit 7a429629ac
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/event_handler.rs
View File

@ -32,7 +32,7 @@ pub async fn event_handler(
} }
async fn on_message(ctx: &serenity::Context, data: &Data, message: &Message) { async fn on_message(ctx: &serenity::Context, data: &Data, message: &Message) {
let regex = Regex::new("^```(?P<language>[0-9a-zA-Z]*)\n(?P<code>(\n|.)+)\n```$").unwrap(); let regex = Regex::new("^(?P<codeblock>```(?:(?P<language>[^\n]*)\n)?(?P<code>[\\s\\S]+?)\n```)(?:\\s*(?P<paths>(?:(?:/|\\.\\.?/)?(?:[^/\\s]+/)*[^/\\s]+\\s*)+))?$").unwrap();
let capture = regex.captures(&message.content); let capture = regex.captures(&message.content);
@ -69,7 +69,6 @@ async fn on_message(ctx: &serenity::Context, data: &Data, message: &Message) {
if let Some((compile_handle, compile_rx)) = container.compile().await { if let Some((compile_handle, compile_rx)) = container.compile().await {
let rx_handle = tokio::spawn(async move { let rx_handle = tokio::spawn(async move {
while let Ok(Some(msg)) = compile_rx.recv() { while let Ok(Some(msg)) = compile_rx.recv() {
print!("{}", msg);
*b.lock().unwrap() += &msg.to_string(); *b.lock().unwrap() += &msg.to_string();
} }
}); });
@ -83,7 +82,6 @@ async fn on_message(ctx: &serenity::Context, data: &Data, message: &Message) {
let b = Arc::clone(&buf); let b = Arc::clone(&buf);
let rx_handle = tokio::spawn(async move { let rx_handle = tokio::spawn(async move {
while let Ok(Some(msg)) = run_code_rx.recv() { while let Ok(Some(msg)) = run_code_rx.recv() {
print!("{}", msg);
*b.lock().unwrap() += &msg.to_string(); *b.lock().unwrap() += &msg.to_string();
} }
}); });
@ -92,8 +90,9 @@ async fn on_message(ctx: &serenity::Context, data: &Data, message: &Message) {
let t = Arc::clone(&timeout); let t = Arc::clone(&timeout);
tokio::spawn(async move { tokio::spawn(async move {
sleep_until(Instant::now() + Duration::from_secs(10)).await; sleep_until(Instant::now() + Duration::from_secs(10)).await;
end_tx.send(()).unwrap(); if let Ok(_) = end_tx.send(()) {
*t.lock().unwrap() = true; *t.lock().unwrap() = true;
}
}); });
let (_, _) = tokio::join!(run_handle, rx_handle); let (_, _) = tokio::join!(run_handle, rx_handle);