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

Adding error context for forward_msgs

Browse Source
This commit is contained in:
link2xt
2024-10-20 08:28:48 +00:00
parent deb14600e8
commit 2e030aaab9
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/chat.rs
View File

@@ -4142,7 +4142,9 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
chat_id chat_id
.unarchive_if_not_muted(context, MessageState::Undefined) .unarchive_if_not_muted(context, MessageState::Undefined)
.await?; .await?;
let mut chat = Chat::load_from_db(context, chat_id).await?; let mut chat = Chat::load_from_db(context, chat_id)
.await
.context("Failed to load chat from the database")?;
if let Some(reason) = chat.why_cant_send(context).await? { if let Some(reason) = chat.why_cant_send(context).await? {
bail!("cannot send to {}: {}", chat_id, reason); bail!("cannot send to {}: {}", chat_id, reason);
} }
@@ -4158,7 +4160,8 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
|row| row.get::<_, MsgId>(0), |row| row.get::<_, MsgId>(0),
|ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into), |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
) )
.await?; .await
.context("Failed to sort forwarded messages by timestamp")?;
for id in ids { for id in ids {
let src_msg_id: MsgId = id; let src_msg_id: MsgId = id;
@@ -4213,9 +4216,14 @@ pub async fn forward_msgs(context: &Context, msg_ids: &[MsgId], chat_id: ChatId)
msg.state = MessageState::OutPending; msg.state = MessageState::OutPending;
new_msg_id = chat new_msg_id = chat
.prepare_msg_raw(context, &mut msg, None, curr_timestamp) .prepare_msg_raw(context, &mut msg, None, curr_timestamp)
.await?; .await
.context("Failed to prepare forwarded message")?;
curr_timestamp += 1; curr_timestamp += 1;
if !create_send_msg_jobs(context, &mut msg).await?.is_empty() { if !create_send_msg_jobs(context, &mut msg)
.await
.context("Failed to create send jobs for the forwarded message")?
.is_empty()
{
context.scheduler.interrupt_smtp().await; context.scheduler.interrupt_smtp().await;
} }
} }