Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(dehtml): skip links with empty text

Browse Source
This commit is contained in:
link2xt
2023-06-13 12:16:00 +00:00
parent 5ac2d1b8cb
commit c3f352aff1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dehtml.rs
View File

@@ -165,9 +165,13 @@ fn dehtml_endtag_cb(event: &BytesEnd, dehtml: &mut Dehtml) {
} }
"a" => { "a" => {
if let Some(ref last_href) = dehtml.last_href.take() { if let Some(ref last_href) = dehtml.last_href.take() {
dehtml.strbuilder += "]("; if dehtml.strbuilder.ends_with('[') {
dehtml.strbuilder += last_href; dehtml.strbuilder.truncate(dehtml.strbuilder.len() - 1);
dehtml.strbuilder += ")"; } else {
dehtml.strbuilder += "](";
dehtml.strbuilder += last_href;
dehtml.strbuilder += ")";
}
} }
} }
"b" | "strong" => { "b" | "strong" => {
@@ -323,9 +327,10 @@ mod tests {
("& bar", "& bar"), ("& bar", "& bar"),
// Despite missing ', this should be shown: // Despite missing ', this should be shown:
("<a href='/foo.png>Hi</a> ", "Hi "), ("<a href='/foo.png>Hi</a> ", "Hi "),
("No link: <a href='https://get.delta.chat/'/>", "No link: "),
( (
"<a href='https://get.delta.chat/'/>", "No link: <a href='https://get.delta.chat/'></a>",
"[](https://get.delta.chat/)", "No link: ",
), ),
("<!doctype html>\n<b>fat text</b>", "*fat text*"), ("<!doctype html>\n<b>fat text</b>", "*fat text*"),
// Invalid html (at least DC should show the text if the html is invalid): // Invalid html (at least DC should show the text if the html is invalid):