aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in mentions

Browse Source 
Fixes #98
This commit is contained in:
Bat 2018-07-18 19:00:49 +02:00
parent 16124e890e
commit 6b58dcfda5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plume-common/src/utils.rs
View File

@ -28,10 +28,15 @@ pub fn md_to_html(md: &str) -> (String, Vec<String>) {
Event::Text(txt) => { 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| { 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 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) (events, in_mention, text_acc + c.to_string().as_ref(), n + 1, mentions)
} else { } 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 = mention.clone();
let short_mention = short_mention.splitn(1, '@').nth(0).unwrap_or(""); let short_mention = short_mention.splitn(1, '@').nth(0).unwrap_or("");
let link = Tag::Link(format!("/@/{}/", mention).into(), short_mention.to_string().into()); let link = Tag::Link(format!("/@/{}/", mention).into(), short_mention.to_string().into());
@ -84,6 +89,7 @@ mod tests {
("mention at @end", vec!["end"]), ("mention at @end", vec!["end"]),
("between parenthesis (@test)", vec!["test"]), ("between parenthesis (@test)", vec!["test"]),
("with some punctuation @test!", vec!["test"]), ("with some punctuation @test!", vec!["test"]),
(" @spaces ", vec!["spaces"]),
]; ];
for (md, mentions) in tests { for (md, mentions) in tests {