feat: better sieve script

applications/email.nix

@@ -106,10 +106,11 @@ with lib; let
       require ["fileinto", "reject"];
       require "variables";
       require "regex";
+      require "subaddress";
 
       # this should be close to teh last step
       if allof (
-        address  :localpart ["To", "Cc"] ["${toString create_config_to}"],
+        address  :user ["To", "Cc"] ["${toString create_config_to}"],
         address  :domain ["To", "Cc"] "skynet.ie"
         ){
         if address :matches ["To", "Cc"] "*@skynet.ie" {
@@ -118,6 +119,8 @@ with lib; let
             fileinto :create "''${1}.Spam_Report";
             stop;
           } else {
+            # no detail, proceed normally
+            if address :detail ["To", "Cc"] "" {
               if header :is "X-Spam" "Yes" {
                 fileinto :create "''${1}.Junk";
                 stop;
@@ -125,6 +128,13 @@ with lib; let
                 fileinto :create "''${1}";
                 stop;
               }
+            } else {
+              # user+subdir
+              if address :matches ["To", "Cc"] "*+*@skynet.ie" {
+                fileinto :create "''${1}.''${2}";
+                stop;
+              }
+            }
           }
         }
       }