From 8ed6d4d709583109755d37b7e53521b6f871b141 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 23 Jul 2023 11:44:46 +0000
Subject: [PATCH] api!: make `MsgId.delete_from_db()` private

Use `delete_msgs()` if you are using the Delta Chat core
as a library and want to delete a message.
---
 src/ephemeral.rs   | 8 ++++----
 src/message.rs     | 2 +-
 src/mimefactory.rs | 2 +-
 src/receive_imf.rs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ephemeral.rs b/src/ephemeral.rs
index 54050a0e3..6d200b99b 100644
--- a/src/ephemeral.rs
+++ b/src/ephemeral.rs
@@ -986,7 +986,7 @@ mod tests {
         t.send_text(self_chat.id, "Saved message, which we delete manually")
             .await;
         let msg = t.get_last_msg_in(self_chat.id).await;
-        msg.id.delete_from_db(&t).await?;
+        msg.id.trash(&t).await?;
         check_msg_is_deleted(&t, &self_chat, msg.id).await;
 
         self_chat
@@ -1003,7 +1003,7 @@ mod tests {
             .await
             .unwrap();
 
-        // Set DeleteDeviceAfter to 1800s. Thend send a saved message which will
+        // Set DeleteDeviceAfter to 1800s. Then send a saved message which will
         // still be deleted after 3600s because DeleteDeviceAfter doesn't apply to saved messages.
         t.set_config(Config::DeleteDeviceAfter, Some("1800"))
             .await?;
@@ -1261,8 +1261,8 @@ mod tests {
         );
         let msg = alice.get_last_msg().await;
 
-        // Message is deleted from the database when its timer expires.
-        msg.id.delete_from_db(&alice).await?;
+        // Message is deleted when its timer expires.
+        msg.id.trash(&alice).await?;
 
         // Message with Message-ID <third@example.com>, referencing <first@example.com> and
         // <second@example.com>, is received.  The message <second@example.come> is not in the
diff --git a/src/message.rs b/src/message.rs
index 6577f2a73..d72344465 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -113,7 +113,7 @@ WHERE id=?;
     }
 
     /// Deletes a message, corresponding MDNs and unsent SMTP messages from the database.
-    pub async fn delete_from_db(self, context: &Context) -> Result<()> {
+    pub(crate) async fn delete_from_db(self, context: &Context) -> Result<()> {
         // We don't use transactions yet, so remove MDNs first to make
         // sure they are not left while the message is deleted.
         context
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 931831ed8..47c06b326 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -1964,7 +1964,7 @@ mod tests {
         let incoming_msg = get_chat_msg(&t, new_msg.chat_id, 0, 2).await;
 
         if delete_original_msg {
-            incoming_msg.id.delete_from_db(&t).await.unwrap();
+            incoming_msg.id.trash(&t).await.unwrap();
         }
 
         if message_arrives_inbetween {
diff --git a/src/receive_imf.rs b/src/receive_imf.rs
index 4222e69ab..994ba980b 100644
--- a/src/receive_imf.rs
+++ b/src/receive_imf.rs
@@ -1274,7 +1274,7 @@ RETURNING id
 
     if let Some(replace_msg_id) = replace_msg_id {
         // "Replace" placeholder with a message that has no parts.
-        replace_msg_id.delete_from_db(context).await?;
+        replace_msg_id.trash(context).await?;
     }
 
     chat_id.unarchive_if_not_muted(context, state).await?;