From 51386671d3474b5020cd43db8d7536ba1ac7979d Mon Sep 17 00:00:00 2001 From: Butter Cat Date: Sun, 2 Feb 2025 23:38:52 -0500 Subject: [PATCH] Fix embedded images sometimes having gaps around them (#295) * Fix images embedded by rewrite_urls() having an empty

above and below them that caused weird gaps in some scenarios * Fix test for new embedding behavior * fix: remove println --------- Co-authored-by: Matthew Esposito --- src/utils.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils.rs b/src/utils.rs index c4991d8..4ed7664 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1010,7 +1010,7 @@ pub fn render_bullet_lists(input_text: &str) -> String { // These are links we want to replace in-body static REDDIT_REGEX: Lazy = Lazy::new(|| Regex::new(r#"href="(https|http|)://(www\.|old\.|np\.|amp\.|new\.|)(reddit\.com|redd\.it)/"#).unwrap()); -static REDDIT_PREVIEW_REGEX: Lazy = Lazy::new(|| Regex::new(r"https?://(external-preview|preview|i)\.redd\.it(.*)[^?]").unwrap()); +static REDDIT_PREVIEW_REGEX: Lazy = Lazy::new(|| Regex::new(r"https?://(external-preview|preview|i)\.redd\.it(.*)").unwrap()); static REDDIT_EMOJI_REGEX: Lazy = Lazy::new(|| Regex::new(r"https?://(www|).redditstatic\.com/(.*)").unwrap()); static REDLIB_PREVIEW_LINK_REGEX: Lazy = Lazy::new(|| Regex::new(r#"/(img|preview/)(pre|external-pre)?/(.*?)>"#).unwrap()); static REDLIB_PREVIEW_TEXT_REGEX: Lazy = Lazy::new(|| Regex::new(r">(.*?)").unwrap()); @@ -1052,7 +1052,7 @@ pub fn rewrite_urls(input_text: &str) -> String { } // image_url contains > at the end of it, and right above this we remove image_text's front >, leaving us with just a single > between them - let image_to_replace = format!(""); + let image_to_replace = format!("

"); // _image_replacement needs to be in scope for the replacement at the bottom of the loop let mut _image_replacement = String::new(); @@ -1501,7 +1501,7 @@ async fn test_fetching_ws() { fn test_rewriting_image_links() { let input = r#"

caption 1

"#; - let output = r#"

caption 1
caption 1
"#; assert_eq!(rewrite_urls(input), output); }