Use 0 value for "delete_server_after" default.

Now 0 means "never delete", 1 means "delete at once" and other values
indicate the number of seconds after which them message should be
deleted from the server.

Configuration value interpretation is moved into
Context.get_config_delete_server_after() function.
This commit is contained in:
Alexander Krotov
2020-03-01 19:22:29 +03:00
parent 5b3bec1aac
commit 8f7a456a39
4 changed files with 27 additions and 9 deletions

View File

@@ -1308,9 +1308,9 @@ fn precheck_imf(context: &Context, rfc724_mid: &str, server_folder: &str, server
if old_server_folder.is_empty() && old_server_uid == 0 {
info!(context, "[move] detected bcc-self {}", rfc724_mid,);
let delete_server_after = context.get_config_int(Config::DeleteServerAfter);
let delete_server_after = context.get_config_delete_server_after();
if delete_server_after != 0 {
if delete_server_after != Some(0) {
context.do_heuristics_moves(server_folder.as_ref(), msg_id);
job_add(
context,
@@ -1321,7 +1321,7 @@ fn precheck_imf(context: &Context, rfc724_mid: &str, server_folder: &str, server
);
}
if delete_server_after >= 0 {
if let Some(delete_server_after) = delete_server_after {
info!(
context,
"Scheduling BCC-self deletion in {} seconds", delete_server_after