From fb325be888987d60b6be8279d022315242105e26 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Sun, 24 May 2020 02:51:46 +0300 Subject: [PATCH] update_autodelete_timeout: ignore trashed messages They are removed in prune_tombstones() which only happens during housekeeping. --- src/chat.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chat.rs b/src/chat.rs index fee9b03bd..b6f57844b 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1611,9 +1611,10 @@ pub fn update_autodelete_timeout(context: &Context) { "SELECT autodelete_timestamp \ FROM msgs \ WHERE autodelete_timestamp != 0 \ + AND chat_id != ? \ ORDER BY autodelete_timestamp ASC \ LIMIT 1", - rusqlite::NO_PARAMS, + params![DC_CHAT_ID_TRASH], ) { Err(err) => { warn!(context, "Can't calculate next autodelete timeout: {}", err);