mirror of
https://github.com/chatmail/core.git
synced 2026-05-14 20:36:30 +03:00
More small tweaks after self-rewiewing
This commit is contained in:
@@ -973,7 +973,6 @@ impl Context {
|
|||||||
.await?
|
.await?
|
||||||
.to_string(),
|
.to_string(),
|
||||||
);
|
);
|
||||||
|
|
||||||
res.insert(
|
res.insert(
|
||||||
"last_housekeeping",
|
"last_housekeeping",
|
||||||
self.get_config_int(Config::LastHousekeeping)
|
self.get_config_int(Config::LastHousekeeping)
|
||||||
|
|||||||
@@ -28,10 +28,10 @@
|
|||||||
//! This setting is not synchronized among devices and applies to all
|
//! This setting is not synchronized among devices and applies to all
|
||||||
//! messages known to the device, including messages sent or received
|
//! messages known to the device, including messages sent or received
|
||||||
//! before configuring the setting.
|
//! before configuring the setting.
|
||||||
//! It deletes messages only from the device, not from the server.
|
|
||||||
//!
|
//!
|
||||||
//! `delete_device_after` configures the maximum time device is
|
//! `delete_device_after` configures the maximum time device is
|
||||||
//! storing the messages locally.
|
//! storing the messages locally,
|
||||||
|
//! but does not delete messages from the server.
|
||||||
//!
|
//!
|
||||||
//! ## How messages are deleted
|
//! ## How messages are deleted
|
||||||
//!
|
//!
|
||||||
|
|||||||
@@ -1382,14 +1382,7 @@ impl Session {
|
|||||||
let res = receive_imf_inner(context, rfc724_mid, body, is_seen).await;
|
let res = receive_imf_inner(context, rfc724_mid, body, is_seen).await;
|
||||||
|
|
||||||
// If the message is not needed anymore on the server, mark it for deletion:
|
// If the message is not needed anymore on the server, mark it for deletion:
|
||||||
info!(
|
|
||||||
context,
|
|
||||||
"dbg Marking for deletion?: bcc_self={}, is_chatmail={}",
|
|
||||||
context.get_config_bool(Config::BccSelf).await?,
|
|
||||||
is_chatmail
|
|
||||||
);
|
|
||||||
if !context.get_config_bool(Config::BccSelf).await? && is_chatmail {
|
if !context.get_config_bool(Config::BccSelf).await? && is_chatmail {
|
||||||
info!(context, "dbg Marking {rfc724_mid} for deletion");
|
|
||||||
context
|
context
|
||||||
.sql
|
.sql
|
||||||
.execute(
|
.execute(
|
||||||
@@ -1398,8 +1391,6 @@ impl Session {
|
|||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
context.scheduler.interrupt_inbox().await;
|
context.scheduler.interrupt_inbox().await;
|
||||||
} else {
|
|
||||||
info!(context, "dbg NOT marking {rfc724_mid} for deletion");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there was an error receiving the message, show a device message:
|
// If there was an error receiving the message, show a device message:
|
||||||
|
|||||||
@@ -2119,7 +2119,7 @@ pub async fn estimate_deletion_cnt(
|
|||||||
) -> Result<usize> {
|
) -> Result<usize> {
|
||||||
ensure!(
|
ensure!(
|
||||||
!from_server,
|
!from_server,
|
||||||
"The `delete_server_after` config option was removed."
|
"The `delete_server_after` config option was removed. You need to pass `false` for `from_server`."
|
||||||
);
|
);
|
||||||
|
|
||||||
let self_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::SELF)
|
let self_chat_id = ChatIdBlocked::lookup_by_contact(context, ContactId::SELF)
|
||||||
|
|||||||
@@ -903,10 +903,6 @@ UPDATE config SET value=? WHERE keyname='configured_addr' AND value!=?1
|
|||||||
|
|
||||||
// Get user-configured server deletion
|
// Get user-configured server deletion
|
||||||
if !received_msg.msg_ids.is_empty() {
|
if !received_msg.msg_ids.is_empty() {
|
||||||
info!(
|
|
||||||
context,
|
|
||||||
"dbg Would mark for deletion previously: rfc724_mid={rfc724_mid}, rfc724_mid_orig={rfc724_mid_orig}"
|
|
||||||
);
|
|
||||||
let target = if received_msg.needs_delete_job {
|
let target = if received_msg.needs_delete_job {
|
||||||
Some("".to_string())
|
Some("".to_string())
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user