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

feat: a single NDN does not mark a group message as failed

Browse Source
This commit is contained in:
B. Petersen
2026-09-17 20:42:38 +02:00
committed by biørn
parent b766a9a8fa
commit 6b62fed6fa
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mimeparser.rs
View File

@@ -2540,19 +2540,18 @@ async fn handle_ndn(
for msg_id in msg_ids {
let mut message = Message::load_from_db(context, msg_id).await?;
let chat = Chat::load_from_db(context, message.chat_id).await?;
if chat.typ == constants::Chattype::OutBroadcast {
continue;
if chat.typ == constants::Chattype::Single {
let aggregated_error = message
.error
.as_ref()
.map(|err| format!("{err}\n\n{err_msg}"));
set_msg_failed(
context,
&mut message,
aggregated_error.as_ref().unwrap_or(err_msg),
)
.await?;
}
let aggregated_error = message
.error
.as_ref()
.map(|err| format!("{err}\n\n{err_msg}"));
set_msg_failed(
context,
&mut message,
aggregated_error.as_ref().unwrap_or(err_msg),
)
.await?;
}
Ok(())

6
src/receive_imf/receive_imf_tests.rs
View File

@@ -726,6 +726,7 @@ async fn test_resend_after_ndn() -> Result<()> {
Ok(())
}
// an NDN in a group does not make the whole message as failed
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
async fn test_parse_ndn_group_msg() -> Result<()> {
let t = TestContext::new().await;
@@ -758,7 +759,7 @@ async fn test_parse_ndn_group_msg() -> Result<()> {
let msg = Message::load_from_db(&t, msg_id).await?;
assert_eq!(msg.state, MessageState::OutFailed);
assert_eq!(msg.state, MessageState::OutDelivered);
let msgs = chat::get_chat_msgs(&t, msg.chat_id).await?;
assert!(matches!(
@@ -766,9 +767,6 @@ async fn test_parse_ndn_group_msg() -> Result<()> {
ChatItem::Message { msg_id } if msg_id == msg.id
));
t.assert_warn("Delivery Status Notification (Failure)")
.await;
Ok(())
}