remove footer-escape-character from message texts

This commit is contained in:
B. Petersen
2020-04-27 16:32:16 +02:00
parent 459fec56db
commit 2a9b967d2d

View File

@@ -184,7 +184,8 @@ fn render_message(lines: &[&str], is_cut_at_begin: bool, is_cut_at_end: bool) ->
if is_cut_at_end && (!is_cut_at_begin || !empty_body) { if is_cut_at_end && (!is_cut_at_begin || !empty_body) {
ret += " [...]"; ret += " [...]";
} }
ret // redo escaping done by escape_message_footer_marks()
ret.replace("\u{200B}", "")
} }
/** /**
@@ -329,16 +330,13 @@ mod tests {
assert_eq!(plain, "text"); // see remove_message_footer() for some explanations assert_eq!(plain, "text"); // see remove_message_footer() for some explanations
let escaped = escape_message_footer_marks(&input); let escaped = escape_message_footer_marks(&input);
let (plain, _) = simplify(escaped, true); let (plain, _) = simplify(escaped, true);
assert_eq!( assert_eq!(plain, "text\n\n--\ntreated as footer when unescaped");
plain,
"text\n\n-\u{200B}-\ntreated as footer when unescaped"
);
let input = "--\ntreated as footer when unescaped".to_string(); let input = "--\ntreated as footer when unescaped".to_string();
let (plain, _) = simplify(input.clone(), true); let (plain, _) = simplify(input.clone(), true);
assert_eq!(plain, ""); // see remove_message_footer() for some explanations assert_eq!(plain, ""); // see remove_message_footer() for some explanations
let escaped = escape_message_footer_marks(&input); let escaped = escape_message_footer_marks(&input);
let (plain, _) = simplify(escaped, true); let (plain, _) = simplify(escaped, true);
assert_eq!(plain, "-\u{200B}-\ntreated as footer when unescaped"); assert_eq!(plain, "--\ntreated as footer when unescaped");
} }
} }