From 219ae0c832c4bdbfcdc89dd1136a03dec82168e9 Mon Sep 17 00:00:00 2001 From: Jacob Henry Date: Sun, 23 Oct 2016 21:07:02 -0400 Subject: [PATCH] Made the bot a bit less keen to respond to messages. WIll now only trigger the bot if the first word is waiton, housejob, etc. --- .sortedfamilytree.txt.swp | Bin 16384 -> 0 bytes WaitonBot.py | 12 +++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 .sortedfamilytree.txt.swp diff --git a/.sortedfamilytree.txt.swp b/.sortedfamilytree.txt.swp deleted file mode 100644 index 57087856c1dcf2e1d717c7bd46b617890421b36e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 diff --git a/WaitonBot.py b/WaitonBot.py index f95bf16..c0c7272 100755 --- a/WaitonBot.py +++ b/WaitonBot.py @@ -5,6 +5,8 @@ from SlackUtil import * from WaitonUtil import handleWaitonMsg #For waitons from ScrollUtil import handleScrollMsg #For scrolls +import re + #Read api token from file apifile = open("apitoken.txt", 'r') SLACK_API = next(apifile).strip() @@ -39,6 +41,10 @@ def handleProfilelessScum(slack, msg, user, for_user=None): f_response = "Set up your profile before talking to me, scum.\n\nThat is to say, fill out your first and last name in your slack user profile! Please use what would be on the waiton list (IE your proper name, not a nickname)." reply(slack, msg, f_response) + +waiton_pattern = re.compile("^waiton") +scroll_pattern = re.compile("^scroll") +housejob_pattern = re.compile("^(house)?job") def main(): #Init slack @@ -68,13 +74,13 @@ def main(): elif for_user and not isValidProfile(for_user):#invalid for_user profile handleProfilelessScum(slack, msg, user, for_user) - elif "waiton" in text: + elif waiton_pattern.match(text): handleWaitonMsg(slack, sheet_service, msg, user, for_user) - elif "scroll" in text: + elif scroll_pattern.match(text): handleScrollMsg(slack, msg) - elif "housejob" in text: + elif housejob_pattern.match(text): reply(slack, msg, "I cannot do that (yet)", username="sadbot") elif killswitch == msg['text'].lower():