From 96ad7bf1632ef4bafeba148288422ffe4cf9bfb2 Mon Sep 17 00:00:00 2001 From: mooons <10822203+mooons@users.noreply.github.com> Date: Sun, 2 Feb 2025 20:26:36 -0800 Subject: [PATCH] feat: render bullet lists (#321) * feat: render bullet lists * tests: add tests --------- Co-authored-by: Matthew Esposito --- src/utils.rs | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/utils.rs b/src/utils.rs index ea14dac..1bc70b9 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -989,6 +989,17 @@ pub fn format_url(url: &str) -> String { } } +static REGEX_BULLET: Lazy = Lazy::new(|| Regex::new(r"(?m)^- (.*)$").unwrap()); +static REGEX_BULLET_CONSECUTIVE_LINES: Lazy = Lazy::new(|| Regex::new(r"\n
    ").unwrap()); + +pub fn render_bullet_lists(input_text: &str) -> String { + // ref: https://stackoverflow.com/a/4902622 + // First enclose each bullet with
    • tags + let text1 = REGEX_BULLET.replace_all(&input_text, "
      • $1
      ").to_string(); + // Then remove any consecutive
      tags + REGEX_BULLET_CONSECUTIVE_LINES.replace_all(&text1, "").to_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()); @@ -1143,6 +1154,10 @@ pub fn rewrite_emotes(media_metadata: &Value, comment: String) -> String { } } } + + // render bullet (unordered) lists + comment = render_bullet_lists(&comment); + // Call rewrite_urls() to transform any other Reddit links rewrite_urls(&comment) } @@ -1505,3 +1520,28 @@ fn test_rewriting_emotes() { let output = r#"

      "#; assert_eq!(rewrite_emotes(&json_input, comment_input.to_string()), output); } + +#[test] +fn test_rewriting_bullet_list() { + let input = r#"

      Hi, I've bought this very same monitor and found no calibration whatsoever. I have an ICC profile that has been set up since I've installed its driver from the LG website and it works ok. I also used http://www.lagom.nl/lcd-test/ to calibrate it. After some good tinkering I've found the following settings + the color profile from the driver gets me past all the tests perfectly: +- Brightness 50 (still have to settle on this one, it's personal preference, it controls the backlight, not the colors) +- Contrast 70 (which for me was the default one) +- Picture mode Custom +- Super resolution + Off (it looks horrible anyway) +- Sharpness 50 (default one I think) +- Black level High (low messes up gray colors) +- DFC Off +- Response Time Middle (personal preference, https://www.blurbusters.com/ show horrible overdrive with it on high) +- Freesync doesn't matter +- Black stabilizer 50 +- Gamma setting on 0 +- Color Temp Medium +How`s your monitor by the way? Any IPS bleed whatsoever? I either got lucky or the panel is pretty good, 0 bleed for me, just the usual IPS glow. How about the pixels? I see the pixels even at one meter away, especially on Microsoft Edge's icon for example, the blue background is just blocky, don't know why.

      +
      "#; +let output = r#"

      Hi, I've bought this very same monitor and found no calibration whatsoever. I have an ICC profile that has been set up since I've installed its driver from the LG website and it works ok. I also used http://www.lagom.nl/lcd-test/ to calibrate it. After some good tinkering I've found the following settings + the color profile from the driver gets me past all the tests perfectly: +

      • Brightness 50 (still have to settle on this one, it's personal preference, it controls the backlight, not the colors)
      • Contrast 70 (which for me was the default one)
      • Picture mode Custom
      • Super resolution + Off (it looks horrible anyway)
      • Sharpness 50 (default one I think)
      • Black level High (low messes up gray colors)
      • DFC Off
      • Response Time Middle (personal preference, https://www.blurbusters.com/ show horrible overdrive with it on high)
      • Freesync doesn't matter
      • Black stabilizer 50
      • Gamma setting on 0
      • Color Temp Medium
      +How`s your monitor by the way? Any IPS bleed whatsoever? I either got lucky or the panel is pretty good, 0 bleed for me, just the usual IPS glow. How about the pixels? I see the pixels even at one meter away, especially on Microsoft Edge's icon for example, the blue background is just blocky, don't know why.

      +
      "#; + + assert_eq!(render_bullet_lists(input), output); +} \ No newline at end of file