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

Replace some ContactId::new() calls with constants

Browse Source
This commit is contained in:
Floris Bruynooghe
2022-04-03 15:29:05 +02:00
parent feb354725a
commit f2c1e5c6e5
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dc_receive_imf.rs
View File

@@ -277,7 +277,7 @@ pub(crate) async fn dc_receive_imf_inner(
}
if let Some(avatar_action) = &mime_parser.user_avatar {
if from_id != ContactId::new(0)
if from_id != ContactId::UNDEFINED
&& context
.update_contacts_timestamp(from_id, Param::AvatarTimestamp, sent_timestamp)
.await?
@@ -305,7 +305,7 @@ pub(crate) async fn dc_receive_imf_inner(
// Ignore MDNs though, as they never contain the signature even if user has set it.
if mime_parser.mdn_reports.is_empty()
&& is_partial_download.is_none()
&& from_id != ContactId::new(0)
&& from_id != ContactId::UNDEFINED
&& context
.update_contacts_timestamp(from_id, Param::StatusTimestamp, sent_timestamp)
.await?
@@ -417,7 +417,7 @@ pub async fn from_field_to_contact_id(
"mail has an empty From header: {:?}", from_address_list
);
Ok((ContactId::new(0), false, Origin::Unknown))
Ok((ContactId::UNDEFINED, false, Origin::Unknown))
}
}
@@ -524,7 +524,7 @@ async fn add_parts(
securejoin_seen = false;
}
let test_normal_chat = if from_id == ContactId::new(0) {
let test_normal_chat = if from_id == ContactId::UNDEFINED {
Default::default()
} else {
ChatIdBlocked::lookup_by_contact(context, from_id).await?
@@ -1144,8 +1144,8 @@ INSERT INTO msgs
stmt.execute(paramsv![
rfc724_mid,
chat_id,
if trash { ContactId::new(0) } else { from_id },
if trash { ContactId::new(0) } else { to_id },
if trash { ContactId::UNDEFINED } else { from_id },
if trash { ContactId::UNDEFINED } else { to_id },
sort_timestamp,
sent_timestamp,
rcvd_timestamp,