From 0a274feba7158a963a9e07369cc7607cc0b8371e Mon Sep 17 00:00:00 2001
From: Stacy Brock <brock@oregonstate.edu>
Date: Tue, 7 Nov 2023 10:04:49 -0800
Subject: [PATCH] Update filters

---
 filter-rules.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/filter-rules.py b/filter-rules.py
index 24628ad..d3d5721 100644
--- a/filter-rules.py
+++ b/filter-rules.py
@@ -43,6 +43,7 @@ BLOCK_KEYWORDS = [
     'unsub_center',
     'unsubscribe',
     'want to receive',
+    'webcast',
     'webinar',
     'white paper',
     'whitepaper',
@@ -58,6 +59,7 @@ BLOCK_DOMAINS = [
     'checkpoint.com',
     'cmadvantage',
     'customeriomail.com',
+    'denodo.com',
     'exacttarget.com',
     'freshsales.io',
     'ikigailabs.io',
@@ -75,6 +77,7 @@ BLOCK_DOMAINS = [
     'pphosted.com',
     'radware.com',
     'rsmatco.com',
+    'rubrain.agency',
     'sendgrid.net',
     'sparkpostmail.com',
     'techmate.com',
@@ -103,6 +106,7 @@ ALLOW = [
     'oregonstate.edu',
     'github.com',
     'osu.atlassian.net',
+    'oregonstateuniversity.atlassian.net',
     'duo.com',
     'sns.amazonaws.com',
     'opsgenie.net',
@@ -139,7 +143,10 @@ def filter_message(self, message):
         'coresys@lists.oregonstate.edu',
         'iar.ref@oregonstate.edu',
         'iar.systems-team@oregonstate.edu',
-        'changes_osu@heliocampus.com'
+        'changes_osu@heliocampus.com',
+        'no-reply@vmockmail.com',
+        'noreply-beaverhub@oregonstate.edu',
+        'noreply@chatter.salesforce.com'
     ]
     if bool([x for x in automated_sources if(x in normalized_from)]):
         unactionable = [x.lower() for x in [
@@ -167,7 +174,10 @@ def filter_message(self, message):
             'loaded into the Index Reimbursement System',
             'JV required for',
             'Changes via Tableau REST API at OSU',
-            'DSDBTEST'
+            'DSDBTEST',
+            'has been assigned to you or your queue',
+            'VMock CSV S3 Upload Failed',
+            'Your Daily Digest for Oregon State University'
         ]]
         if is_in_message(unactionable, message):
             self._log_result(message, 'moving to unactionable')
@@ -201,9 +211,10 @@ def filter_message(self, message):
 
     # filter ACTWON
     if 'actwon_administration@lists.oregonstate.edu' in normalized_from:
-        self._log_result(message, 'moving to ACTWON')
-        move_message(message, 'lists/ACTWON')
-        return
+        if not is_in_message(['stacy brock', 'mist', 'integration'], message):
+            self._log_result(message, 'moving to ACTWON')
+            move_message(message, 'lists/ACTWON')
+            return
 
     # filter ACUG
     if 'isacug@oregonstate.edu' in normalized_to:
@@ -211,6 +222,12 @@ def filter_message(self, message):
         move_message(message, 'lists/ACUG')
         return
 
+    # filter HelioCampus helpdesk
+    if 'jira@heliocampus.atlassian.net' in normalized_from:
+        self._log_result(message, 'moving to 5-hc-helpdesk')
+        move_message(message, '5-hc-helpdesk')
+        return
+
     # filter alerts-sig
     if (normalized_from in ['mcc-b11-stor1@oregonstate.edu',
                             'mcc-b12-stor1@oregonstate.edu',
@@ -241,6 +258,13 @@ def filter_message(self, message):
         message.delete()
         return
 
+    # delete Rave junk
+    if ('guardian@getrave.com' in normalized_from
+            and 'New Guardian Chat' in message.subject):
+        self._log_result(message, 'deleting rave message')
+        message.delete()
+        return
+
     # delete conference spam
     if 'brocks+conf@onid.oregonstate.edu' in normalized_to:
         self._log_result(message, 'deleting conference spam')