Add AllEmails ExpressionType and refactor RuleMatcher

Introduced a new `ExpressionType` value `AllEmails` to allow rules to match all emails without applying specific filters. Updated `RuleMatcher` logic to handle this new type, including skipping age and status filters when applicable.

Refactored `RuleMatcher` by introducing the `ProcessMatch` method to centralize match processing logic, improving readability and reducing duplication. Fixed a bug in `PassesStatusFilters` where the `RequireUnread` logic was inverted.

Updated `appsettings.json` to rename and enable the `"CleanupOldUnread"` rule, set its `ExpressionType` to `AllEmails`, and adjust its configuration.

Author: Timothy Dodd

src/MailZort/Program.cs

@@ -118,7 +118,8 @@ public enum ExpressionType
     StartsWith,
     EndsWith,
     MatchesRegex,
-    DoesNotMatchRegex
+    DoesNotMatchRegex,
+    AllEmails
 }
 public class Stats
 {

src/MailZort/Services/RuleMatcher.cs

@@ -12,7 +12,7 @@ public RuleMatcher(ILogger<RuleMatcher> logger)
     }
     private static bool PassesAgeFilter(Rule rule, EmailReceivedEventArgs email)
     {
-        if (email.IsRead)
+        if (email.IsRead && rule.ExpressionType != ExpressionType.AllEmails)
         {
             if (DateTimeOffset.Now.Subtract(email.ReceivedDate).TotalHours > 2)
                 return true;
@@ -28,7 +28,7 @@ private static bool PassesAgeFilter(Rule rule, EmailReceivedEventArgs email)
     private static bool PassesStatusFilters(Rule rule, EmailReceivedEventArgs email)
     {
         // Check RequireUnread filter - if set to true, email must be unread
-        if (rule.RequireUnread == true && email.IsRead)
+        if (rule.RequireUnread == true && !email.IsRead)
             return false;
 
         // Check RequireNotImportant filter - if set to true, email must NOT be important
@@ -37,11 +37,47 @@ private static bool PassesStatusFilters(Rule rule, EmailReceivedEventArgs email)
 
         return true;
     }
+    private bool ProcessMatch(Rule rule, EmailReceivedEventArgs email, string value, MatchResult matchResult)
+    {
+        _logger.LogDebug("Match found! Rule: {RuleId}, Value: '{Value}', Location: {Location}",
+                  rule.Name, value, matchResult.MatchLocation);
+
+        var passesAge = PassesAgeFilter(rule, email);
+        _logger.LogDebug("Age filter result: {PassesAge} for rule: {RuleId}", passesAge, rule.Name);
+
+        var passesStatus = PassesStatusFilters(rule, email);
+        _logger.LogDebug("Status filter result: {PassesStatus} for rule: {RuleId} (IsRead: {IsRead}, IsImportant: {IsImportant})",
+            passesStatus, rule.Name, email.IsRead, email.IsImportant);
+
+        if (passesAge && passesStatus)
+        {
+            _logger.LogInformation("RULE MATCHED! Rule: {RuleId}, Value: '{Value}', Location: {Location}, Subject: '{Subject}'",
+                rule.Name, value, matchResult.MatchLocation, email.Subject);
+            return true;
+        }
+        else
+        {
+            _logger.LogDebug("Match found but failed filters (age: {PassesAge}, status: {PassesStatus}). Rule: {RuleId}",
+                passesAge, passesStatus, rule.Name);
+            return false;
+        }
+    }
     // Enhanced version with detailed debug information
     public bool CheckRuleMatch(Rule rule, EmailReceivedEventArgs email)
     {
         _logger.LogDebug("Checking rule: {RuleId} with {ValueCount} values", rule.Name, rule.Values?.Count ?? 0);
-
+        if (rule.ExpressionType == ExpressionType.AllEmails)
+        {
+            _logger.LogDebug("ExpressionType is AllEmails, automatically passing match for rule: {RuleId}", rule.Name);
+            if (ProcessMatch(rule, email, "AllEmails", new MatchResult { IsMatch = true, MatchLocation = "AllEmails" }))
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
         foreach (var value in rule.Values!)
         {
             _logger.LogDebug("Testing value: '{Value}' with expression type: {ExpressionType}", value, rule.ExpressionType);
@@ -55,27 +91,10 @@ public bool CheckRuleMatch(Rule rule, EmailReceivedEventArgs email)
 
             if (matchResult.IsMatch)
             {
-                _logger.LogDebug("Match found! Rule: {RuleId}, Value: '{Value}', Location: {Location}",
-                    rule.Name, value, matchResult.MatchLocation);
-
-                var passesAge = PassesAgeFilter(rule, email);
-                _logger.LogDebug("Age filter result: {PassesAge} for rule: {RuleId}", passesAge, rule.Name);
-
-                var passesStatus = PassesStatusFilters(rule, email);
-                _logger.LogDebug("Status filter result: {PassesStatus} for rule: {RuleId} (IsRead: {IsRead}, IsImportant: {IsImportant})",
-                    passesStatus, rule.Name, email.IsRead, email.IsImportant);
-
-                if (passesAge && passesStatus)
+                if (ProcessMatch(rule, email, value, matchResult))
                 {
-                    _logger.LogInformation("RULE MATCHED! Rule: {RuleId}, Value: '{Value}', Location: {Location}, Subject: '{Subject}'",
-                        rule.Name, value, matchResult.MatchLocation, email.Subject);
                     return true;
                 }
-                else
-                {
-                    _logger.LogDebug("Match found but failed filters (age: {PassesAge}, status: {PassesStatus}). Rule: {RuleId}",
-                        passesAge, passesStatus, rule.Name);
-                }
             }
             else
             {

src/MailZort/appsettings.json

@@ -83,17 +83,16 @@
             ]
         },
         {
-            "Name": "Cleanup Old Unread",
+            "Name": "CleanupOldUnread",
             "Folder": "Inbox",
             "MoveTo": "Trash",
             "DaysOld": 15,
             "RequireUnread": true,
             "RequireNotImportant": true,
             "LookIn": 0,
-            "ExpressionType": 6,
-            "IsEnabled": false,
+            "ExpressionType": 8,
+            "IsEnabled": true,
             "Values": [
-                ".*"
             ]
         }
     ]