fixes

co-authored-by: Hocuri <[email protected]>

Author: Septias

src/message.rs

@@ -5,7 +5,6 @@ use std::collections::HashSet;
 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};
@@ -1795,7 +1794,9 @@ pub async fn delete_msgs_ex(
             "Cannot request deletion of unencrypted message for others"
         );
 
-        deleted_info_msgs.extend(get_webxdc_info_messages(context, &msg).await?);
+        if msg.viewtype == Viewtype::Webxdc {
+            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,31 +1816,17 @@ pub async fn delete_msgs_ex(
         }
     }
     res?;
-
-    if !deleted_info_msgs.is_empty() {
-        if modified_chat_ids.len() > 1 {
-            bail!("Can only delete from same chat.");
-        }
-        let (info_msg_ids, info_msg_rfc724): (Vec<_>, Vec<_>) =
-            deleted_info_msgs.into_iter().unzip();
-
-        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, chat_id, &info_msg_rfc724).await?;
-        }
-    }
+    let (info_msg_ids, mut info_msg_rfc724): (Vec<_>, Vec<_>) =
+        deleted_info_msgs.into_iter().unzip();
 
     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() {
-            send_delete_request(context, chat_id, &deleted_rfc724_mid).await?;
+            info_msg_rfc724.extend(deleted_rfc724_mid);
+            send_delete_request(context, chat_id, &info_msg_rfc724).await?;
         }
     } else {
         context
@@ -1849,6 +1836,11 @@ 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?;
@@ -1867,6 +1859,10 @@ async fn send_delete_request(
     deleted_rfc724_mid: &[String],
 ) -> Result<MsgId> {
     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(" "));