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

fix: Send pre-message after successful sending of post-message (#8063)

Browse Source 
This isn't easy to test though because the `smtp` sending code requires an SMTP connection, so it's
only tested (by already existing tests) that messages are queued in the right order.

Another problem is that the `smtp` sending logic doesn't try to send any messages following a
failed-to-send message until the retry limit is reached, so if there's smth wrong with a
post-message, other unrelated messages are delayed, but this problem has already existed.
This commit is contained in:
iequidoo
2026-05-08 00:14:43 -04:00
parent ca70fb9b3a
commit a18bf74620
8 changed files with 66 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/chat.rs
View File

@@ -2970,15 +2970,6 @@ WHERE id=?
)?;
for recipients_chunk in recipients.chunks(chunk_size) {
let recipients_chunk = recipients_chunk.join(" ");
if let Some(pre_msg) = &rendered_pre_msg {
let row_id = stmt.execute((
&pre_msg.rfc724_mid,
&recipients_chunk,
&pre_msg.message,
msg.id,
))?;
row_ids.push(row_id.try_into()?);
}
let row_id = stmt.execute((
&rendered_msg.rfc724_mid,
&recipients_chunk,
@@ -2986,6 +2977,16 @@ WHERE id=?
msg.id,
))?;
row_ids.push(row_id.try_into()?);
let Some(pre_msg) = &rendered_pre_msg else {
continue;
};
let row_id = stmt.execute((
&pre_msg.rfc724_mid,
&recipients_chunk,
&pre_msg.message,
msg.id,
))?;
row_ids.push(row_id.try_into()?);
}
Ok(row_ids)
};