fix: delete webxdc info messages

Author: Septias

src/message.rs

@@ -6,6 +6,7 @@ use std::collections::VecDeque;
 use std::path::{Path, PathBuf};
 use std::str;
 
+use anyhow::bail;
 use anyhow::{Context as _, Result, ensure, format_err};
 use deltachat_contact_tools::{VcardContact, parse_vcard};
 use deltachat_derive::{FromSql, ToSql};
@@ -1717,25 +1718,26 @@ pub(crate) async fn delete_msg_locally(context: &Context, msg: &Message) -> Resu
 pub(crate) async fn get_webxdc_info_messages(
     context: &Context,
     msg: &Message,
-) -> Result<Vec<MsgId>> {
+) -> Result<Vec<(MsgId, String)>> {
     let msg_ids = context
         .sql
         .query_map(
-            r#"SELECT id, param
+            r#"SELECT id, rfc724_mid, param
                     FROM msgs
                     WHERE chat_id=?1 AND hidden=0 AND mime_in_reply_to = ?2
                     "#,
-            (msg.chat_id, msg.id),
+            (msg.chat_id, &msg.rfc724_mid),
             |row| {
                 let info_msg_id: MsgId = row.get(0)?;
+                let info_msg_rfc724: String = row.get(1)?;
                 let last_param: Params = row.get::<_, String>(2)?.parse().unwrap_or_default();
-                Ok((info_msg_id, last_param))
+                Ok((info_msg_id, info_msg_rfc724, last_param))
             },
             |row| {
                 Ok(row
                     .filter_map(Result::ok)
-                    .filter(|(_, param)| param.get_cmd() == SystemMessage::WebxdcInfoMessage)
-                    .map(|(msg_id, _)| msg_id)
+                    .filter(|(_, _, param)| param.get_cmd() == SystemMessage::WebxdcInfoMessage)
+                    .map(|(msg_id, rfc724, _)| (msg_id, rfc724))
                     .collect::<Vec<_>>())
             },
         )
@@ -1781,9 +1783,9 @@ pub async fn delete_msgs_ex(
     let mut modified_chat_ids = HashSet::new();
     let mut deleted_rfc724_mid = Vec::new();
     let mut res = Ok(());
-    let mut msg_ids_queue = VecDeque::from_iter(msg_ids.iter().cloned());
+    let mut deleted_info_msgs = Vec::new();
 
-    while let Some(msg_id) = msg_ids_queue.pop_front() {
+    for &msg_id in msg_ids {
         let msg = Message::load_from_db(context, msg_id).await?;
         ensure!(
             !delete_for_all || msg.from_id == ContactId::SELF,
@@ -1794,7 +1796,7 @@ pub async fn delete_msgs_ex(
             "Cannot request deletion of unencrypted message for others"
         );
 
-        msg_ids_queue.extend(get_webxdc_info_messages(context, &msg).await?);
+        deleted_info_msgs.extend(get_webxdc_info_messages(context, &msg).await?);
         modified_chat_ids.insert(msg.chat_id);
         deleted_rfc724_mid.push(msg.rfc724_mid.clone());
 
@@ -1815,22 +1817,23 @@ 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.len() > 0 && modified_chat_ids.len() > 1 {
+        bail!("Can delete only from same chat.");
+    }
+
+    if let Some(chat_id) = modified_chat_ids.iter().next() {
+        send_delete_request(context, &info_msg_rfc724, chat_id).await?;
+    }
+
     if delete_for_all {
         ensure!(
             modified_chat_ids.len() == 1,
             "Can delete only from same chat."
         );
         if let Some(chat_id) = modified_chat_ids.iter().next() {
-            let mut msg = Message::new_text("🚮".to_owned());
-            // We don't want to send deletion requests in chats w/o encryption:
-            // - These are usually chats with non-DC clients who won't respect deletion requests
-            //   anyway and display a weird trash bin message instead.
-            // - Deletion of world-visible unencrypted messages seems not very useful.
-            msg.param.set_int(Param::GuaranteeE2ee, 1);
-            msg.param
-                .set(Param::DeleteRequestFor, deleted_rfc724_mid.join(" "));
-            msg.hidden = true;
-            send_msg(context, *chat_id, &mut msg).await?;
+            send_delete_request(context, &deleted_rfc724_mid, chat_id).await?;
         }
     } else {
         context
@@ -1840,6 +1843,11 @@ pub async fn delete_msgs_ex(
             .await?;
     }
 
+    for &msg_id in info_msg_ids.iter() {
+        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?;
@@ -1852,6 +1860,20 @@ pub async fn delete_msgs_ex(
     Ok(())
 }
 
+async fn send_delete_request(
+    context: &Context,
+    deleted_rfc724_mid: &Vec<String>,
+    chat_id: &ChatId,
+) -> Result<(), anyhow::Error> {
+    let mut msg = Message::new_text("🚮".to_owned());
+    msg.param.set_int(Param::GuaranteeE2ee, 1);
+    msg.param
+        .set(Param::DeleteRequestFor, deleted_rfc724_mid.join(" "));
+    msg.hidden = true;
+    send_msg(context, *chat_id, &mut msg).await?;
+    Ok(())
+}
+
 /// Marks requested messages as seen.
 pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()> {
     if msg_ids.is_empty() {