From 32ee617038bfd619b0e24cdec2e226a9685d1941 Mon Sep 17 00:00:00 2001
From: Niklas Elsbrock <mail@nelsbrock.de>
Date: Fri, 2 Jun 2023 19:37:04 +0200
Subject: [PATCH] fix formatting of item descriptions

---
 src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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<i64> {
 }
 
 fn html_to_discord_markdown(input: &str) -> String {
-    let re_times = regex!(r#"^.*<br/><br/>"#i);
+    let re_times = regex!(r#"^.*<br\s*/>\s*<br\s*/>"#i);
+    let re_bold = regex!(r#"<b\s*>((.|\n)*?)</b\s*>"#i);
+    let re_italic = regex!(r#"<i\s*>((.|\n)*?)</i\s*>"#i);
+    let re_strikethrough = regex!(r#"<s\s*>((.|\n)*?)</s\s*>"#i);
     let re_newline = regex!(r#"<br\s*/?>"#i);
-    let re_bold = regex!(r#"<b>(.*?)</b>"#i);
-    let re_italic = regex!(r#"<i>(.*?)</i>"#i);
-    let re_strikethrough = regex!(r#"<s>(.*?)</s>"#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()
 }