clean up mail filters

2 files changed, 25 insertions, 10 deletions

diff --git a/.config/maildirproc/att.rc b/.config/maildirproc/att.rc
index e862b3f..445d1ba 100644
--- a/.config/maildirproc/att.rc
+++ b/.config/maildirproc/att.rc
@@ -132,6 +132,10 @@ def my_filters(mail):
 		mail.move(".software.pacman-dev")
 		return
 
+	if (mail["List-Id"].matches("systemd-devel.lists.freedesktop.org")):
+		mail.move(".software.systemd-devel")
+		return
+
 	for subject_re in [
 		"\[Stow-[^\]]*\].*",
 		]:
@@ -179,6 +183,7 @@ def my_filters(mail):
 		or is_to_or_from(mail,"mitchprather@sbcglobal.net")
 		or is_to_or_from(mail,"oa_wap@yahoo.com")
 		or is_to_or_from(mail,"mytroop.us")
+		or is_to_or_from(mail,"crossroadsbsa.org")
 		):
 		mail.move(".Troop276")
 		return
@@ -305,6 +310,7 @@ def my_filters(mail):
 		or mail["Subject"].contains("newsletter")
 		or mail["From"].contains("Info@mailing.jamendo.com")
 		or mail["From"].contains("info@demandprogress.org")
+		or (mail["From"].contains("@sparkfun.com") and mail["Message-Id"].contains("rsgsv.net"))
 		):
 		mail.move(".misc.Newsletters")
 		return
diff --git a/.config/maildirproc/purdue.rc b/.config/maildirproc/purdue.rc
index 0ffc1e6..4ebfbc4 100644
--- a/.config/maildirproc/purdue.rc
+++ b/.config/maildirproc/purdue.rc
@@ -27,7 +27,7 @@ def piazza_topic(mail, topic):
 	return (
 		is_to_or_from(mail, topic+" on Piazza")
 		or mail["Subject"].contains(topic+" on Piazza"))
-	
+
 def my_filters(mail):
 	# Generic stuff ########################################################
 
@@ -37,11 +37,11 @@ def my_filters(mail):
 		or is_to_or_from(mail,"Purduealumni@purdue.edu")
 		or is_to_or_from(mail,"pase@purdue.edu")
 		):
-		mail.move("INBOX.PASE")
+		mail.move("INBOX.crap.PASE")
 		return
 
 	if mail["Subject"].contains("[PLUG]"):
-		mail.move("INBOX.PLUG")
+		mail.move("INBOX.crap.PLUG")
 		return
 
 	if mail["From"].matches(".*bursar.*@purdue\.edu"):
@@ -49,15 +49,19 @@ def my_filters(mail):
 		return
 
 	if mail["From"].contains("mailhub-admin@purdue.edu"):
-		mail.move("INBOX.mailhub-admin")
+		mail.move("INBOX.crap.mailhub-admin")
 		return
 
 	if mail["From"].matches("pmx-.*@purdue.edu"):
-		mail.move("INBOX.spam")
+		mail.move("INBOX.crap.spam")
 		return
 
 	if is_to_or_from(mail,"linkedin.com"):
-		mail.move("INBOX.LinkedIn")
+		mail.move("INBOX.crap.LinkedIn")
+		return
+
+	if is_to_or_from(mail,"follet.com"):
+		mail.move("INBOX.Follet")
 		return
 
 	if (
@@ -65,12 +69,14 @@ def my_filters(mail):
 		or is_to_or_from(mail,"@edrtrust.com")
 		or is_to_or_from(mail,"@propertysolutions.com")
 		or is_to_or_from(mail,"collegestationapartments@gmail.com")
+		or is_to_or_from_re(mail,"collegestationca\..*@gmail.com")
+		or is_to_or_from(mail, "@duke-energy.com")
 		):
-		mail.move("INBOX.CollegeStation")
+		mail.move("INBOX.housing.CollegeStation")
 		return
 
 	if mail["From"].matches("facebook(|mail)\.com"):
-		mail.move("INBOX.Facebook")
+		mail.move("INBOX.crap.Facebook")
 		return
 
 	if (
@@ -78,7 +84,7 @@ def my_filters(mail):
 		or is_to_or_from(mail,"@cable.comcast.com")
 		or is_to_or_from(mail,"@apexsystemsinc.com")
 		):
-		mail.move("INBOX.Comcast")
+		mail.move("INBOX.work.Comcast")
 		return
 
 	if (
@@ -86,7 +92,10 @@ def my_filters(mail):
 		or mail["Subject"].contains("[CS Opportunity Update]")
 		or mail["Subject"].contains("[CS Majors]")
 		):
-		mail.move("INBOX.CS")
+		mail.move("INBOX.crap.CS")
+		return
+	if (mail["From"].contains("shumakl@cs.purdue.edu") and mail["Subject"].matches("^cron:")):
+		mail.move("INBOX.crap.cron")
 		return
 
 	# Fall 2012 ############################################################