mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 09:26:29 +03:00
Change to functional style
This commit is contained in:
@@ -44,35 +44,24 @@ pub fn simplify(mut input: String, is_chat_message: bool) -> (String, bool) {
|
|||||||
let original_lines = &lines;
|
let original_lines = &lines;
|
||||||
|
|
||||||
let lines = remove_message_footer(lines);
|
let lines = remove_message_footer(lines);
|
||||||
let (lines, mut has_nonstandard_footer) = if !is_chat_message {
|
|
||||||
remove_nonstandard_footer(lines)
|
|
||||||
} else {
|
|
||||||
(lines, false)
|
|
||||||
};
|
|
||||||
let (lines, mut has_bottom_quote) = if !is_chat_message {
|
|
||||||
remove_bottom_quote(lines)
|
|
||||||
} else {
|
|
||||||
(lines, false)
|
|
||||||
};
|
|
||||||
let (mut lines, mut has_top_quote) = if !is_chat_message {
|
|
||||||
remove_top_quote(lines)
|
|
||||||
} else {
|
|
||||||
(lines, false)
|
|
||||||
};
|
|
||||||
|
|
||||||
if lines.iter().all(|it| it.trim().is_empty()) {
|
let text = if is_chat_message {
|
||||||
lines = original_lines;
|
render_message(lines, false, false)
|
||||||
has_top_quote = false;
|
} else {
|
||||||
has_bottom_quote = false;
|
let (lines, has_nonstandard_footer) = remove_nonstandard_footer(lines);
|
||||||
has_nonstandard_footer = false;
|
let (lines, has_bottom_quote) = remove_bottom_quote(lines);
|
||||||
}
|
let (lines, has_top_quote) = remove_top_quote(lines);
|
||||||
|
|
||||||
// re-create buffer from the remaining lines
|
if lines.iter().all(|it| it.trim().is_empty()) {
|
||||||
let text = render_message(
|
render_message(original_lines, false, false)
|
||||||
lines,
|
} else {
|
||||||
has_top_quote,
|
render_message(
|
||||||
has_nonstandard_footer || has_bottom_quote,
|
lines,
|
||||||
);
|
has_top_quote,
|
||||||
|
has_nonstandard_footer || has_bottom_quote,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
};
|
||||||
(text, is_forwarded)
|
(text, is_forwarded)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user