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

refactor: accept &mut Message in create_send_msg_job()

Browse Source
This commit is contained in:
link2xt
2023-07-08 22:00:40 +00:00
parent dc4396a699
commit d5c5ff8b3f
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/chat.rs
View File

@@ -2388,7 +2388,7 @@ async fn prepare_send_msg(
); );
message::update_msg_state(context, msg.id, MessageState::OutPending).await?; message::update_msg_state(context, msg.id, MessageState::OutPending).await?;
} }
let row_id = create_send_msg_job(context, msg.id).await?; let row_id = create_send_msg_job(context, msg).await?;
Ok(row_id) Ok(row_id)
} }
@@ -2398,10 +2398,10 @@ async fn prepare_send_msg(
/// group with only self and no BCC-to-self configured. /// group with only self and no BCC-to-self configured.
/// ///
/// The caller has to interrupt SMTP loop or otherwise process a new row. /// The caller has to interrupt SMTP loop or otherwise process a new row.
async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<i64>> { pub(crate) async fn create_send_msg_job(
let mut msg = Message::load_from_db(context, msg_id).await?; context: &Context,
msg: &mut Message,
/* create message */ ) -> Result<Option<i64>> {
let needs_encryption = msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default(); let needs_encryption = msg.param.get_bool(Param::GuaranteeE2ee).unwrap_or_default();
let attach_selfavatar = match shall_attach_selfavatar(context, msg.chat_id).await { let attach_selfavatar = match shall_attach_selfavatar(context, msg.chat_id).await {
@@ -2412,7 +2412,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
} }
}; };
let mimefactory = MimeFactory::from_msg(context, &msg, attach_selfavatar).await?; let mimefactory = MimeFactory::from_msg(context, msg, attach_selfavatar).await?;
let mut recipients = mimefactory.recipients(); let mut recipients = mimefactory.recipients();
@@ -2434,16 +2434,17 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
// may happen eg. for groups with only SELF and bcc_self disabled // may happen eg. for groups with only SELF and bcc_self disabled
info!( info!(
context, context,
"Message {msg_id} has no recipient, skipping smtp-send." "Message {} has no recipient, skipping smtp-send.", msg.id
); );
msg_id.set_delivered(context).await?; msg.id.set_delivered(context).await?;
msg.state = MessageState::OutDelivered;
return Ok(None); return Ok(None);
} }
let rendered_msg = match mimefactory.render(context).await { let rendered_msg = match mimefactory.render(context).await {
Ok(res) => Ok(res), Ok(res) => Ok(res),
Err(err) => { Err(err) => {
message::set_msg_failed(context, msg_id, &err.to_string()).await?; message::set_msg_failed(context, msg.id, &err.to_string()).await?;
Err(err) Err(err)
} }
}?; }?;
@@ -2452,13 +2453,13 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
/* unrecoverable */ /* unrecoverable */
message::set_msg_failed( message::set_msg_failed(
context, context,
msg_id, msg.id,
"End-to-end-encryption unavailable unexpectedly.", "End-to-end-encryption unavailable unexpectedly.",
) )
.await?; .await?;
bail!( bail!(
"e2e encryption unavailable {} - {:?}", "e2e encryption unavailable {} - {:?}",
msg_id, msg.id,
needs_encryption needs_encryption
); );
} }
@@ -2514,7 +2515,7 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
&rendered_msg.rfc724_mid, &rendered_msg.rfc724_mid,
recipients, recipients,
&rendered_msg.message, &rendered_msg.message,
msg_id, msg.id,
), ),
) )
.await?; .await?;
@@ -3568,7 +3569,7 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
.prepare_msg_raw(context, &mut msg, None, curr_timestamp) .prepare_msg_raw(context, &mut msg, None, curr_timestamp)
.await?; .await?;
curr_timestamp += 1; curr_timestamp += 1;
if create_send_msg_job(context, new_msg_id).await?.is_some() { if create_send_msg_job(context, &mut msg).await?.is_some() {
context context
.scheduler .scheduler
.interrupt_smtp(InterruptInfo::new(false)) .interrupt_smtp(InterruptInfo::new(false))
@@ -3628,7 +3629,7 @@ pub async fn resend_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
chat_id: msg.chat_id, chat_id: msg.chat_id,
msg_id: msg.id, msg_id: msg.id,
}); });
if create_send_msg_job(context, msg.id).await?.is_some() { if create_send_msg_job(context, &mut msg).await?.is_some() {
context context
.scheduler .scheduler
.interrupt_smtp(InterruptInfo::new(false)) .interrupt_smtp(InterruptInfo::new(false))