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

Try to add decent error msg (doesnt work yet)

Browse Source
This commit is contained in:
Hocuri
2020-06-05 23:00:01 +02:00
parent f02c17cae4
commit 3757e5dca1
4 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mimeparser.rs
View File

@@ -572,7 +572,6 @@ impl MimeMessage {
if let Some(report) = self.process_delivery_status(context, mail)? {
self.failed_msg = Some(report);
}
let mut part = Part::default();
part.typ = Viewtype::Unknown;
self.parts.push(part);
@@ -854,7 +853,13 @@ impl MimeMessage {
}
/// Handle reports (only MDNs for now)
pub async fn handle_reports(&self, context: &Context, from_id: u32, sent_timestamp: i64) {
pub async fn handle_reports(
&self,
context: &Context,
from_id: u32,
sent_timestamp: i64,
parts: &Vec<Part>,
) {
for report in &self.reports {
for original_message_id in
std::iter::once(&report.original_message_id).chain(&report.additional_message_ids)
@@ -869,7 +874,12 @@ impl MimeMessage {
}
if let Some(original_message_id) = &self.failed_msg {
message::ndn_from_ext(context, from_id, original_message_id, "TODO error message").await
let error = parts
.iter()
.find(|p| p.typ == Viewtype::Text)
.map(|p| &p.msg);
info!(context, "msg_failed {:?}", error);
message::ndn_from_ext(context, from_id, original_message_id, error).await
}
}