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

dc_receive_imf: extract insert_msg_id from created_db_entries

Browse Source 
This makes add_parts() accept one argument less
This commit is contained in:
link2xt
2021-07-31 18:17:28 +03:00
parent 31b930b2fa
commit 6f644f5c7c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dc_receive_imf.rs
View File

@@ -123,7 +123,6 @@ pub(crate) async fn dc_receive_imf_inner(
let mut hidden = false; let mut hidden = false;
let mut needs_delete_job = false; let mut needs_delete_job = false;
let mut insert_msg_id = MsgId::new_unset();
let mut created_db_entries = Vec::new(); let mut created_db_entries = Vec::new();
let mut create_event_to_send = Some(CreateEvent::MsgsChanged); let mut create_event_to_send = Some(CreateEvent::MsgsChanged);
@@ -178,7 +177,6 @@ pub(crate) async fn dc_receive_imf_inner(
&mut hidden, &mut hidden,
seen, seen,
&mut needs_delete_job, &mut needs_delete_job,
&mut insert_msg_id,
&mut created_db_entries, &mut created_db_entries,
&mut create_event_to_send, &mut create_event_to_send,
fetching_existing_messages, fetching_existing_messages,
@@ -187,6 +185,12 @@ pub(crate) async fn dc_receive_imf_inner(
.await .await
.map_err(|err| err.context("add_parts error"))?; .map_err(|err| err.context("add_parts error"))?;
let insert_msg_id = if let Some((_chat_id, msg_id)) = created_db_entries.last() {
*msg_id
} else {
MsgId::new_unset()
};
if mime_parser.location_kml.is_some() || mime_parser.message_kml.is_some() { if mime_parser.location_kml.is_some() || mime_parser.message_kml.is_some() {
save_locations( save_locations(
context, context,
@@ -362,7 +366,6 @@ async fn add_parts(
hidden: &mut bool, hidden: &mut bool,
seen: bool, seen: bool,
needs_delete_job: &mut bool, needs_delete_job: &mut bool,
insert_msg_id: &mut MsgId,
created_db_entries: &mut Vec<(ChatId, MsgId)>, created_db_entries: &mut Vec<(ChatId, MsgId)>,
create_event_to_send: &mut Option<CreateEvent>, create_event_to_send: &mut Option<CreateEvent>,
fetching_existing_messages: bool, fetching_existing_messages: bool,
@@ -1049,10 +1052,6 @@ INSERT INTO msgs
} }
drop(conn); drop(conn);
if let Some(id) = ids.iter().last() {
*insert_msg_id = *id;
}
if !is_hidden { if !is_hidden {
chat_id.unarchive(context).await?; chat_id.unarchive(context).await?;
} }