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

@@ -204,14 +204,14 @@ pub fn dc_receive_imf(
}
} else {
// Get user-configured server deletion
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) {
// Move message if we don't delete it immediately.
context.do_heuristics_moves(server_folder.as_ref(), insert_msg_id);
}
if delete_server_after >= 0 {
if let Some(delete_server_after) = delete_server_after {
info!(
context,
"Scheduling message deletion in {} seconds", delete_server_after