From 6b58dcfda54be951971dacefcc062a25b3553f8c Mon Sep 17 00:00:00 2001 From: Bat Date: Wed, 18 Jul 2018 19:00:49 +0200 Subject: [PATCH] Fix a bug in mentions Fixes #98 --- plume-common/src/utils.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plume-common/src/utils.rs b/plume-common/src/utils.rs index 364a3912..8e1acbaa 100644 --- a/plume-common/src/utils.rs +++ b/plume-common/src/utils.rs @@ -28,10 +28,15 @@ pub fn md_to_html(md: &str) -> (String, Vec) { Event::Text(txt) => { let (evts, _, _, _, new_mentions) = txt.chars().fold((vec![], false, String::new(), 0, vec![]), |(mut events, in_mention, text_acc, n, mut mentions), c| { if in_mention { - if (c.is_alphanumeric() || c == '@' || c == '.' || c == '-' || c == '_') && (n < (txt.chars().count() - 1)) { + let char_matches = c.is_alphanumeric() || c == '@' || c == '.' || c == '-' || c == '_'; + if char_matches && (n < (txt.chars().count() - 1)) { (events, in_mention, text_acc + c.to_string().as_ref(), n + 1, mentions) } else { - let mention = text_acc + c.to_string().as_ref(); + let mention = if char_matches { + text_acc + c.to_string().as_ref() + } else { + text_acc + }; let short_mention = mention.clone(); let short_mention = short_mention.splitn(1, '@').nth(0).unwrap_or(""); let link = Tag::Link(format!("/@/{}/", mention).into(), short_mention.to_string().into()); @@ -84,6 +89,7 @@ mod tests { ("mention at @end", vec!["end"]), ("between parenthesis (@test)", vec!["test"]), ("with some punctuation @test!", vec!["test"]), + (" @spaces ", vec!["spaces"]), ]; for (md, mentions) in tests {