X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=learn_from_spam;h=306b227c4e13975c49efc4bde800dda786910f22;hb=0c9b112effdd642db560859dbae5fb77d1bfea56;hp=0072598b6fd7c210efcfd492b0ccfce8f7e2d50a;hpb=4c2a8b2ca22f49fd06817080e8803504732fae5f;p=bin.git

diff --git a/learn_from_spam b/learn_from_spam
index 0072598..306b227 100755
--- a/learn_from_spam
+++ b/learn_from_spam
@@ -1,14 +1,36 @@
 #!/bin/bash
 
+# these are for non-spamc setups
+SPAM_REPORT="spamassassin --report"
+HAM_REPORT="spamassassin --revoke"
+SPAM_CHECK="spamassassin -e"
+
+# these are for spamc
+SPAM_REPORT="spamc --learntype=spam"
+HAM_REPORT="spamc --learntype=ham"
+SPAM_CHECK="spamc -c"
+
 if [ "$(basename $0)" = "learn_from_spam" ]; then
     for file in "$@"; do
-        spamassassin -r < "$file" >/dev/null;
-        grep -e '^From ' -e 'From: ' "$file" | spamassassin -R >/dev/null;
+        if ! formail -c < "$file"|grep -q '^List-Id'; then
+            $SPAM_REPORT < "$file" >/dev/null 2>&1;
+        fi;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --add-to-blacklist >/dev/null 2>&1;
+        formail -c < "$file" | grep -e '^From ' -e 'From: ' | spamassassin --remove-from-whitelist >/dev/null 2>&1;
+        # check to see if it's still spam
+        if ! $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+            # this message is still not spam; may need custom rules
+            spamc < "$file" > ~/Maildir/spam/needs_rules/cur/"$(basename "$file")" 2>/dev/null;
+        fi;
     done;
 elif [ "$(basename $0)" = "learn_from_ham" ]; then
     for file in "$@"; do
-        spamassassin -k < "$file" >/dev/null;
-        grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: ' "$file"|spamassassin -W>/dev/null;
+        $HAM_REPORT < "$file" >/dev/null 2>&1;
+        formail -c < "$file" |grep -e '^From ' -e 'From: ' -e 'To: ' -e 'Cc: '|spamassassin --add-to-whitelist >/dev/null 2>&1;
+        if $SPAM_CHECK < "$file" >/dev/null 2>&1; then
+            mkdir -p ~/Maildir/spam/needs_ham_rules/cur;
+            spamc < "$file" > ~/Maildir/spam/needs_ham_rules/cur/"$(basename "$file")" 2>/dev/null;
+        fi;
     done;
 else
     "Called in a way this script cannot recognize";