From d0ee21e6dcf0ffe9bf6120b5e7dd6c4d4beb0d59 Mon Sep 17 00:00:00 2001 From: link2xt Date: Mon, 25 Sep 2023 09:30:36 +0000 Subject: [PATCH] refactor: flatten `GENERATED_PREFIX` check in `receive_imf_inner` --- src/receive_imf.rs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/receive_imf.rs b/src/receive_imf.rs index d7b8bfe55..2011f39b2 100644 --- a/src/receive_imf.rs +++ b/src/receive_imf.rs @@ -113,21 +113,20 @@ pub(crate) async fn receive_imf_inner( { Err(err) => { warn!(context, "receive_imf: can't parse MIME: {err:#}."); - let msg_ids; - if !rfc724_mid.starts_with(GENERATED_PREFIX) { - let row_id = context - .sql - .execute( - "INSERT INTO msgs(rfc724_mid, chat_id) VALUES (?,?)", - (rfc724_mid, DC_CHAT_ID_TRASH), - ) - .await?; - msg_ids = vec![MsgId::new(u32::try_from(row_id)?)]; - } else { - return Ok(None); + if rfc724_mid.starts_with(GENERATED_PREFIX) { // We don't have an rfc724_mid, there's no point in adding a trash entry + return Ok(None); } + let row_id = context + .sql + .execute( + "INSERT INTO msgs(rfc724_mid, chat_id) VALUES (?,?)", + (rfc724_mid, DC_CHAT_ID_TRASH), + ) + .await?; + let msg_ids = vec![MsgId::new(u32::try_from(row_id)?)]; + return Ok(Some(ReceivedMsg { chat_id: DC_CHAT_ID_TRASH, state: MessageState::Undefined,