cleanup

Author: Septias

src/message.rs

@@ -1818,9 +1818,9 @@ pub async fn delete_msgs_ex(
 
     if !deleted_info_msgs.is_empty() {
         if modified_chat_ids.len() > 1 {
-            bail!("Can delete only from same chat.");
+            bail!("Can only delete from same chat.");
         }
-        let (info_msg_ids, info_msg_rfc724): (Vec<MsgId>, Vec<_>) =
+        let (info_msg_ids, info_msg_rfc724): (Vec<_>, Vec<_>) =
             deleted_info_msgs.into_iter().unzip();
 
         for &msg_id in &info_msg_ids {
@@ -1829,7 +1829,7 @@ pub async fn delete_msgs_ex(
         }
 
         if let Some(chat_id) = modified_chat_ids.iter().next() {
-            send_delete_request(context, &info_msg_rfc724, chat_id).await?;
+            send_delete_request(context, chat_id, &info_msg_rfc724).await?;
         }
     }
 
@@ -1839,7 +1839,7 @@ pub async fn delete_msgs_ex(
             "Can delete only from same chat."
         );
         if let Some(chat_id) = modified_chat_ids.iter().next() {
-            send_delete_request(context, &deleted_rfc724_mid, chat_id).await?;
+            send_delete_request(context, chat_id, &deleted_rfc724_mid).await?;
         }
     } else {
         context
@@ -1863,16 +1863,15 @@ pub async fn delete_msgs_ex(
 
 async fn send_delete_request(
     context: &Context,
-    deleted_rfc724_mid: &[String],
     chat_id: &ChatId,
-) -> Result<(), anyhow::Error> {
+    deleted_rfc724_mid: &[String],
+) -> Result<MsgId> {
     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(())
+    send_msg(context, *chat_id, &mut msg).await
 }
 
 /// Marks requested messages as seen.