diff --git a/src/main.rs b/src/main.rs index eae9cec..d85a440 100644 --- a/src/main.rs +++ b/src/main.rs @@ -32,17 +32,17 @@ fn validity_time_to_timestamp(input: &str) -> anyhow::Result { } fn html_to_discord_markdown(input: &str) -> String { - let re_times = regex!(r#"^.*

"#i); + let re_times = regex!(r#"^.*\s*"#i); + let re_bold = regex!(r#"((.|\n)*?)"#i); + let re_italic = regex!(r#"((.|\n)*?)"#i); + let re_strikethrough = regex!(r#"((.|\n)*?)"#i); let re_newline = regex!(r#""#i); - let re_bold = regex!(r#"(.*?)"#i); - let re_italic = regex!(r#"(.*?)"#i); - let re_strikethrough = regex!(r#"(.*?)"#i); let input = re_times.replace(input, ""); - let input = re_newline.replace_all(&input, "\n"); let input = re_bold.replace_all(&input, "**$1**"); let input = re_italic.replace_all(&input, "*$1*"); let input = re_strikethrough.replace_all(&input, "~~$1~~"); + let input = re_newline.replace_all(&input, "\n"); input.to_string() }