chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Don't parse markdown twice

Browse Source
This commit is contained in:
Jonas Platte 2023-08-24 09:43:32 +02:00
parent d66c07b1fa
commit a47df86ade
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ruma-common/src/events/room/message.rs
View File

@ -942,7 +942,8 @@ pub(crate) fn parse_markdown(text: &str) -> Option<String> {
let mut found_first_paragraph = false; let mut found_first_paragraph = false;
let has_markdown = Parser::new_ext(text, OPTIONS).any(|ref event| { let parser_events: Vec<_> = Parser::new_ext(text, OPTIONS).collect();
let has_markdown = parser_events.iter().any(|ref event| {
let is_text = matches!(event, Event::Text(_)); let is_text = matches!(event, Event::Text(_));
let is_break = matches!(event, Event::SoftBreak | Event::HardBreak); let is_break = matches!(event, Event::SoftBreak | Event::HardBreak);
let is_first_paragraph_start = if matches!(event, Event::Start(Tag::Paragraph)) { let is_first_paragraph_start = if matches!(event, Event::Start(Tag::Paragraph)) {
@ -965,7 +966,7 @@ pub(crate) fn parse_markdown(text: &str) -> Option<String> {
} }
let mut html_body = String::new(); let mut html_body = String::new();
pulldown_cmark::html::push_html(&mut html_body, Parser::new_ext(text, OPTIONS)); pulldown_cmark::html::push_html(&mut html_body, parser_events.into_iter());
Some(html_body) Some(html_body)
} }