Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 23:06:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

api!: make MsgId.delete_from_db() private

Browse Source 
Use `delete_msgs()` if you are using the Delta Chat core
as a library and want to delete a message.
This commit is contained in:
link2xt
2023-07-23 11:44:46 +00:00
parent 60bacbec47
commit 8ed6d4d709
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ephemeral.rs
View File

@@ -986,7 +986,7 @@ mod tests {
t.send_text(self_chat.id, "Saved message, which we delete manually") t.send_text(self_chat.id, "Saved message, which we delete manually")
.await; .await;
let msg = t.get_last_msg_in(self_chat.id).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; check_msg_is_deleted(&t, &self_chat, msg.id).await;
self_chat self_chat
@@ -1003,7 +1003,7 @@ mod tests {
.await .await
.unwrap(); .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. // still be deleted after 3600s because DeleteDeviceAfter doesn't apply to saved messages.
t.set_config(Config::DeleteDeviceAfter, Some("1800")) t.set_config(Config::DeleteDeviceAfter, Some("1800"))
.await?; .await?;
@@ -1261,8 +1261,8 @@ mod tests {
); );
let msg = alice.get_last_msg().await; let msg = alice.get_last_msg().await;
// Message is deleted from the database when its timer expires. // Message is deleted when its timer expires.
msg.id.delete_from_db(&alice).await?; msg.id.trash(&alice).await?;
// Message with Message-ID <third@example.com>, referencing <first@example.com> and // 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 // <second@example.com>, is received. The message <second@example.come> is not in the

2
src/message.rs
View File

@@ -113,7 +113,7 @@ WHERE id=?;
} }
/// Deletes a message, corresponding MDNs and unsent SMTP messages from the database. /// 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 // We don't use transactions yet, so remove MDNs first to make
// sure they are not left while the message is deleted. // sure they are not left while the message is deleted.
context context

2
src/mimefactory.rs
View File

@@ -1964,7 +1964,7 @@ mod tests {
let incoming_msg = get_chat_msg(&t, new_msg.chat_id, 0, 2).await; let incoming_msg = get_chat_msg(&t, new_msg.chat_id, 0, 2).await;
if delete_original_msg { if delete_original_msg {
incoming_msg.id.delete_from_db(&t).await.unwrap(); incoming_msg.id.trash(&t).await.unwrap();
} }
if message_arrives_inbetween { if message_arrives_inbetween {

2
src/receive_imf.rs
View File

@@ -1274,7 +1274,7 @@ RETURNING id
if let Some(replace_msg_id) = replace_msg_id { if let Some(replace_msg_id) = replace_msg_id {
// "Replace" placeholder with a message that has no parts. // "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?; chat_id.unarchive_if_not_muted(context, state).await?;