inline function

squash

Author: Septias

src/message.rs

@@ -1816,19 +1816,28 @@ pub async fn delete_msgs_ex(
         }
     }
     res?;
-    let (info_msg_ids, mut info_msg_rfc724): (Vec<_>, Vec<_>) =
-        deleted_info_msgs.into_iter().unzip();
+    let (info_msg_ids, 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() {
-            info_msg_rfc724.extend(deleted_rfc724_mid);
-            send_delete_request(context, chat_id, &info_msg_rfc724).await?;
+            deleted_rfc724_mid.extend(info_msg_rfc724);
+            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?;
         }
     } else {
+        deleted_rfc724_mid.extend(info_msg_rfc724);
         context
             .add_sync_item(SyncData::DeleteMessages {
                 msgs: deleted_rfc724_mid,
@@ -1853,23 +1862,6 @@ pub async fn delete_msgs_ex(
     Ok(())
 }
 
-async fn send_delete_request(
-    context: &Context,
-    chat_id: &ChatId,
-    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(" "));
-    msg.hidden = true;
-    send_msg(context, *chat_id, &mut msg).await
-}
-
 /// Marks requested messages as seen.
 pub async fn markseen_msgs(context: &Context, msg_ids: Vec<MsgId>) -> Result<()> {
     if msg_ids.is_empty() {