Mailfilter: Refactor SPAM stuff

diff --git a/mailfiter b/mailfiter
index 50f57d4808b317bfe67dde92270ddd2a91dc5871..5accb458a55224e60899aae1e24ccd086f904ed8 100644 (file)
--- a/mailfiter
+++ b/mailfiter
@@ -1,16 +1,36 @@
-if (/^X-Cam-SpamScore: sss/)
+
+# Definite spam  - don't even bother archiving this stuff
+
+if(/^From:.*@datingdirectaffinity\.com/)
 {
-       to "Maildir/.Junk"
+       exit
+}
+
+if(/^From:.*@.*dealcloud\.co\.uk/)
+{
+       exit
 }
 
-if (/^X-Cam-SpamScore: ss/)
+if ( hasaddr("compromised@richardwhiuk.com") )
 {
-       to "Maildir/.Junk.Possibly"
+       exit
 }
 
-if (/^X-Cam-Spamscore: s/)
+if (/^From:.*Sex Direct/)
 {
-       to "Maildir/.Junk.Maybe"
+       exit
+}
+
+# Junk Mail
+
+if (/^X-Cam-SpamScore: s/)
+{
+       if (/TVD_PH_BODY_ACCOUNTS_PRE/)
+       {
+               to "Maildir/.Junk.Possibly"
+       }
+
+       to "Maildir/.Junk"
 }
 
 if ( hasaddr("richardwhiuk@yahoo.co.uk"))
@@ -21,6 +41,18 @@ if ( hasaddr("richardwhiuk@yahoo.co.uk"))
        }
 }
 
+# Not Junk, but spammy and dull
+
+if ( hasaddr("srcf+logs@hermes.cam.ac.uk") )
+{
+       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+}
+
+if ( hasaddr("logcheck@srcf.net") )
+{
+       to "Maildir/.Societies.SRCF.Sysadmin.Archive.Logs"
+}
+
 if (/^From:.*@britishgas\.co\.uk/)
 {
        to "Maildir/.House.British Gas"
@@ -1370,18 +1402,6 @@ if(/^From:.*@.*tfl\.gov\.uk/)
        to "Maildir/.Travel.TFL"
 }
 
-# SPAM 
-
-if(/^From:.*@datingdirectaffinity\.com/)
-{
-       exit
-}
-
-if(/^From:.*@.*dealcloud\.co\.uk/)
-{
-       exit
-}
-
 # Work
 
 if( hasaddr("issues@jitsi.java.net") )