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

refactor: make last_added_location_id an Option

Browse Source
This commit is contained in:
link2xt
2023-07-28 16:01:31 +00:00
parent a02a593f47
commit 85739ba6ad
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/chat.rs
View File

@@ -2389,14 +2389,13 @@ async fn create_send_msg_job(context: &Context, msg_id: MsgId) -> Result<Option<
msg.chat_id.set_gossiped_timestamp(context, time()).await?; msg.chat_id.set_gossiped_timestamp(context, time()).await?;
} }
if 0 != rendered_msg.last_added_location_id { if let Some(last_added_location_id) = rendered_msg.last_added_location_id {
if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, time()).await { if let Err(err) = location::set_kml_sent_timestamp(context, msg.chat_id, time()).await {
error!(context, "Failed to set kml sent_timestamp: {err:#}."); error!(context, "Failed to set kml sent_timestamp: {err:#}.");
} }
if !msg.hidden { if !msg.hidden {
if let Err(err) = if let Err(err) =
location::set_msg_location_id(context, msg.id, rendered_msg.last_added_location_id) location::set_msg_location_id(context, msg.id, last_added_location_id).await
.await
{ {
error!(context, "Failed to set msg_location_id: {err:#}."); error!(context, "Failed to set msg_location_id: {err:#}.");
} }

10
src/mimefactory.rs
View File

@@ -66,7 +66,7 @@ pub struct MimeFactory<'a> {
in_reply_to: String, in_reply_to: String,
references: String, references: String,
req_mdn: bool, req_mdn: bool,
last_added_location_id: u32, last_added_location_id: Option<u32>,
/// If the created mime-structure contains sync-items, /// If the created mime-structure contains sync-items,
/// the IDs of these items are listed here. /// the IDs of these items are listed here.
@@ -85,7 +85,7 @@ pub struct RenderedEmail {
// pub envelope: Envelope, // pub envelope: Envelope,
pub is_encrypted: bool, pub is_encrypted: bool,
pub is_gossiped: bool, pub is_gossiped: bool,
pub last_added_location_id: u32, pub last_added_location_id: Option<u32>,
/// A comma-separated string of sync-IDs that are used by the rendered email /// A comma-separated string of sync-IDs that are used by the rendered email
/// and must be deleted once the message is actually queued for sending /// and must be deleted once the message is actually queued for sending
@@ -223,7 +223,7 @@ impl<'a> MimeFactory<'a> {
in_reply_to, in_reply_to,
references, references,
req_mdn, req_mdn,
last_added_location_id: 0, last_added_location_id: None,
sync_ids_to_delete: None, sync_ids_to_delete: None,
attach_selfavatar, attach_selfavatar,
}; };
@@ -264,7 +264,7 @@ impl<'a> MimeFactory<'a> {
in_reply_to: String::default(), in_reply_to: String::default(),
references: String::default(), references: String::default(),
req_mdn: false, req_mdn: false,
last_added_location_id: 0, last_added_location_id: None,
sync_ids_to_delete: None, sync_ids_to_delete: None,
attach_selfavatar: false, attach_selfavatar: false,
}; };
@@ -876,7 +876,7 @@ impl<'a> MimeFactory<'a> {
.body(kml_content); .body(kml_content);
if !self.msg.param.exists(Param::SetLatitude) { if !self.msg.param.exists(Param::SetLatitude) {
// otherwise, the independent location is already filed // otherwise, the independent location is already filed
self.last_added_location_id = last_added_location_id; self.last_added_location_id = Some(last_added_location_id);
} }
Ok(part) Ok(part)
} }