diff --git a/filter-rules.py b/filter-rules.py index 6684e5e..d18598a 100644 --- a/filter-rules.py +++ b/filter-rules.py @@ -41,6 +41,7 @@ BLOCK_KEYWORDS = [ ] BLOCK_DOMAINS = [ + 'atscale.com', 'astutechsolutions.com', 'bytespeed.com', 'cmadvantage', @@ -97,7 +98,8 @@ ALLOW = [ 'busyconf.com', 'support@githubsupport.com', 'microsoft.com', - 'docusign.net' + 'docusign.net', + 'ideal-logic.com' ] normalized = {} @@ -138,7 +140,8 @@ def filter_message(self, message): 'Status Change in your Detail Code Request', 'loaded into the Index Reimbursement System', 'JV required for', - 'Changes via Tableau REST API at OSU' + 'Changes via Tableau REST API at OSU', + 'DSDBTEST' ]] if is_in_message(unactionable, message): self._log_result(message, 'moving to unactionable') @@ -164,6 +167,12 @@ def filter_message(self, message): move_message(message, 'unactionable') return + # filter dependabot + if 'dependabot[bot]' in str(message.sender): + self._log_result(message, 'moving to dependabot') + move_message(message, '99-dependabot') + return + # filter ACTWON if 'actwon_administration@lists.oregonstate.edu' in normalized_from: self._log_result(message, 'moving to ACTWON') @@ -193,6 +202,13 @@ 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 + # delete conference spam if 'brocks+conf@onid.oregonstate.edu' in normalized_to: self._log_result(message, 'deleting conference spam') diff --git a/requirements.txt b/requirements.txt index 7177c0b..da184c7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ backports.zoneinfo==0.2.1 beautifulsoup4==4.11.1 certifi==2022.6.15 -charset-normalizer==2.1.0 +charset-normalizer==2.1.1 idna==3.3 -O365==2.0.19 +O365==2.0.20 oauthlib==3.2.0 pendulum==2.1.2 python-dateutil==2.8.2 -pytz==2022.1 +pytz==2022.2.1 pytz-deprecation-shim==0.1.0.post0 pytzdata==2020.1 requests==2.28.1 @@ -15,6 +15,6 @@ requests-oauthlib==1.3.1 six==1.16.0 soupsieve==2.3.2.post1 stringcase==1.2.0 -tzdata==2022.1 +tzdata==2022.2 tzlocal==4.2 -urllib3==1.26.9 +urllib3==1.26.12