cleanup

squash

Author: Septias

src/message.rs

@@ -1816,16 +1816,21 @@ pub async fn delete_msgs_ex(
     }
     res?;
 
-    let (info_msg_ids, info_msg_rfc724): (Vec<MsgId>, Vec<_>) =
-        deleted_info_msgs.into_iter().unzip();
-    if !info_msg_rfc724.is_empty() && modified_chat_ids.len() > 1 {
-        bail!("Can delete only from same chat.");
-    }
+    if !deleted_info_msgs.is_empty() {
+        if modified_chat_ids.len() > 1 {
+            bail!("Can delete only from same chat.");
+        }
+        let (info_msg_ids, info_msg_rfc724): (Vec<MsgId>, Vec<_>) =
+            deleted_info_msgs.into_iter().unzip();
 
-    if let Some(chat_id) = modified_chat_ids.iter().next()
-        && !info_msg_rfc724.is_empty()
-    {
-        send_delete_request(context, &info_msg_rfc724, chat_id).await?;
+        for &msg_id in &info_msg_ids {
+            let msg = Message::load_from_db(context, msg_id).await?;
+            delete_msg_locally(context, &msg).await?;
+        }
+
+        if let Some(chat_id) = modified_chat_ids.iter().next() {
+            send_delete_request(context, &info_msg_rfc724, chat_id).await?;
+        }
     }
 
     if delete_for_all {
@@ -1844,11 +1849,6 @@ pub async fn delete_msgs_ex(
             .await?;
     }
 
-    for &msg_id in &info_msg_ids {
-        let msg = Message::load_from_db(context, msg_id).await?;
-        delete_msg_locally(context, &msg).await?;
-    }
-
     for &msg_id in msg_ids {
         let msg = Message::load_from_db(context, msg_id).await?;
         delete_msg_locally(context, &msg).await?;

src/webxdc/webxdc_tests.rs

@@ -1633,7 +1633,6 @@ async fn test_webxdc_info_msg_delete() -> Result<()> {
     assert_eq!(chat_id.get_msg_cnt(&t).await?, 4);
     delete_msgs(&t, &[instance.id]).await?;
     assert_eq!(chat_id.get_msg_cnt(&t).await?, 1);
-
     Ok(())
 }