Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ureq = { version = "3", default-features = false, features = ["rustls-no-provide
tar = "0.4"
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
comrak = { version = "=0.52.0", default-features = false }
lol_html = "2"
lol_html = "3"
tempfile = "3"
sparkv = "0.1"

Expand Down
21 changes: 7 additions & 14 deletions src/markdown_render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ pub fn inline_email_styles(html: &str) -> String {
use lol_html::{HtmlRewriter, Settings, element};

let mut output: Vec<u8> = Vec::with_capacity(html.len() + 1024);
let element_handlers: Vec<_> = STYLED_TAGS
let settings = STYLED_TAGS
.iter()
.map(|(tag, style)| {
element!(*tag, move |el| {
.fold(Settings::new(), |settings, (tag, style)| {
settings.append_element_content_handler(element!(*tag, move |el| {
let merged = match el.get_attribute("style") {
Some(existing) if !existing.trim().is_empty() => {
let trimmed = existing.trim_end_matches(';').trim_end();
Expand All @@ -163,17 +163,10 @@ pub fn inline_email_styles(html: &str) -> String {
el.set_attribute("style", &merged)
.expect("style is always a valid attribute name");
Ok(())
})
})
.collect();

let mut rewriter = HtmlRewriter::new(
Settings {
element_content_handlers: element_handlers,
..Settings::default()
},
|chunk: &[u8]| output.extend_from_slice(chunk),
);
}))
});

let mut rewriter = HtmlRewriter::new(settings, |chunk: &[u8]| output.extend_from_slice(chunk));

if rewriter.write(html.as_bytes()).is_err() || rewriter.end().is_err() {
// The rewriter only fails on internal-state issues we don't expect
Expand Down
Loading