mirror of
https://github.com/chatmail/core.git
synced 2026-05-09 01:46:30 +03:00
More small tweaks after self-rewiewing
This commit is contained in:
@@ -973,7 +973,6 @@ impl Context {
|
||||
.await?
|
||||
.to_string(),
|
||||
);
|
||||
|
||||
res.insert(
|
||||
"last_housekeeping",
|
||||
self.get_config_int(Config::LastHousekeeping)
|
||||
|
||||
@@ -28,10 +28,10 @@
|
||||
//! This setting is not synchronized among devices and applies to all
|
||||
//! messages known to the device, including messages sent or received
|
||||
//! before configuring the setting.
|
||||
//! It deletes messages only from the device, not from the server.
|
||||
//!
|
||||
//! `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
|
||||
//!
|
||||
|
||||
@@ -1384,14 +1384,7 @@ impl Session {
|
||||
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:
|
||||
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 {
|
||||
info!(context, "dbg Marking {rfc724_mid} for deletion");
|
||||
context
|
||||
.sql
|
||||
.execute(
|
||||
@@ -1400,8 +1393,6 @@ impl Session {
|
||||
)
|
||||
.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:
|
||||
|
||||
@@ -2125,7 +2125,7 @@ pub async fn estimate_deletion_cnt(
|
||||
) -> Result<usize> {
|
||||
ensure!(
|
||||
!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)
|
||||
|
||||
@@ -905,10 +905,6 @@ UPDATE config SET value=? WHERE keyname='configured_addr' AND value!=?1
|
||||
|
||||
// Get user-configured server deletion
|
||||
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 {
|
||||
Some("".to_string())
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user