From 31fe6aed35080b3ea07a176d9aa248dde76fa560 Mon Sep 17 00:00:00 2001 From: chylex Date: Sat, 4 Jun 2022 21:24:42 +0200 Subject: [PATCH] Stop ignoring removal filters for messages and download items if the filter matches all --- .../Database/Sqlite/SqliteDatabaseFile.cs | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/app/Server/Database/Sqlite/SqliteDatabaseFile.cs b/app/Server/Database/Sqlite/SqliteDatabaseFile.cs index 38bb0c6..b1cf890 100644 --- a/app/Server/Database/Sqlite/SqliteDatabaseFile.cs +++ b/app/Server/Database/Sqlite/SqliteDatabaseFile.cs @@ -403,16 +403,12 @@ LEFT JOIN replied_to rt ON m.message_id = rt.message_id" + filter.GenerateWhereC } public void RemoveMessages(MessageFilter filter, FilterRemovalMode mode) { - var whereClause = filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching); - - if (!string.IsNullOrEmpty(whereClause)) { - var perf = log.Start(); - - DeleteFromTable("messages", whereClause); - totalMessagesComputer.Recompute(); - - perf.End(); - } + var perf = log.Start(); + + DeleteFromTable("messages", filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching)); + totalMessagesComputer.Recompute(); + + perf.End(); } public int CountAttachments(AttachmentFilter? filter = null) { @@ -502,11 +498,7 @@ LEFT JOIN replied_to rt ON m.message_id = rt.message_id" + filter.GenerateWhereC } public void RemoveDownloadItems(DownloadItemFilter? filter, FilterRemovalMode mode) { - var whereClause = filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching); - - if (!string.IsNullOrEmpty(whereClause)) { - DeleteFromTable("downloads", whereClause); - } + DeleteFromTable("downloads", filter.GenerateWhereClause(invert: mode == FilterRemovalMode.KeepMatching)); } public DownloadStatusStatistics GetDownloadStatusStatistics() {