Update filters

filter-rules.py

@@ -1,16 +1,17 @@
 BLOCK_EMAIL = [
     'chirhart@amazon.com',
     'ron.krogel@citrix.com',
+    'lisa@duo.com',
     'replieswelcome@duo.com',
     'webinars@duo.com',
-    'diversity@oregonstate.edu',
+    'alerts@alerts.mail.hpe.com',
+    'viva-noreply@microsoft.com',
     'jramiro@pagerduty.com',
     'info@snowflake.com',
-    'lisa@duo.com',
-    'viva-noreply@microsoft.com',
-    'alerts@alerts.mail.hpe.com',
     'noreply-marketplace@zoom.us',
     'equal.opportunity@oregonstate.edu',
+    'diversity@oregonstate.edu',
+    'evals@oregonstate.edu',
     'sv_uit_voicemail_cxe@oregonstateuniversity.onmicrosoft.com',
 ]
 
@@ -224,19 +225,19 @@ def filter_message(self, message):
         move_message(message, 'lists/backup-nightly')
         return
 
-    # filter Atlassian spam
-    if ('confluence@osu.atlassian.net' in normalized_from
-            and '[Confluence] Daily Digest' in message.subject):
-        self._log_result(message, 'deleting atlassian spam')
-        message.delete()
-        return
-
     # filter quarantine spam
     if 'quarantine@messaging.microsoft.com' in normalized_from:
         self._log_result(message, 'moving to unactionable')
         move_message(message, 'unactionable')
         return
 
+    # delete Atlassian spam
+    if ('confluence@osu.atlassian.net' in normalized_from
+            and '[Confluence] Daily Digest' in message.subject):
+        self._log_result(message, 'deleting atlassian spam')
+        message.delete()
+        return
+
     # delete conference spam
     if 'brocks+conf@onid.oregonstate.edu' in normalized_to:
         self._log_result(message, 'deleting conference spam')