Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 21:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add SimplifiedText structure

Browse Source 
Return structure from `simplify` instead of 5-tuple.
This commit is contained in:
link2xt
2022-06-12 21:08:32 +00:00
parent 8a4e07c83e
commit d947479a60
3 changed files with 159 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mimeparser.rs
View File

@@ -27,7 +27,7 @@ use crate::location;
use crate::message::{self, Viewtype};
use crate::param::{Param, Params};
use crate::peerstate::Peerstate;
use crate::simplify::simplify;
use crate::simplify::{simplify, SimplifiedText};
use crate::stock_str;
use crate::sync::SyncItems;
@@ -927,22 +927,27 @@ impl MimeMessage {
let mut dehtml_failed = false;
let (simplified_txt, is_forwarded, is_cut, top_quote, footer) =
if decoded_data.is_empty() {
("".to_string(), false, false, None, None)
} else {
let is_html = mime_type == mime::TEXT_HTML;
let out = if is_html {
self.is_mime_modified = true;
dehtml(&decoded_data).unwrap_or_else(|| {
dehtml_failed = true;
decoded_data.clone()
})
} else {
let SimplifiedText {
text: simplified_txt,
is_forwarded,
is_cut,
top_quote,
footer,
} = if decoded_data.is_empty() {
Default::default()
} else {
let is_html = mime_type == mime::TEXT_HTML;
let out = if is_html {
self.is_mime_modified = true;
dehtml(&decoded_data).unwrap_or_else(|| {
dehtml_failed = true;
decoded_data.clone()
};
simplify(out, self.has_chat_version())
})
} else {
decoded_data.clone()
};
simplify(out, self.has_chat_version())
};
self.is_mime_modified = self.is_mime_modified
|| ((is_forwarded || is_cut || top_quote.is_some())