From 8fec26ddee5082e3c907fde8d070530ad51fe817 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 4 Jun 2019 11:46:26 -0400 Subject: [PATCH] better handling --- sopel_modules/SpiceBot/AI.py | 5 +++-- sopel_modules/SpiceBot_AI/AI_aiml.py | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/AI.py b/sopel_modules/SpiceBot/AI.py index ebe7642..c88ef4b 100644 --- a/sopel_modules/SpiceBot/AI.py +++ b/sopel_modules/SpiceBot/AI.py @@ -89,13 +89,14 @@ class SpiceBot_AI(): return aiml_response def bot_message_precipher(self, bot, trigger, message): + message = message.upper() puct_dict = {"!": "exclamationmark", ".": "period", "?": "questionmark", ",": "comma"} for puctuation in puct_dict.keys(): message = message.replace(puctuation, puct_dict[puctuation]) for botitem in ["nick"]: - message = message.replace(str(eval("bot." + botitem)), "bot" + botitem) + message = message.replace(str(eval("bot." + botitem)).upper(), str("bot" + botitem).upper()) for triggeritem in ["nick", "sender"]: - message = message.replace(str(eval("trigger." + triggeritem)), "trigger" + triggeritem) + message = message.replace(str(eval("trigger." + triggeritem)).upper(), str("trigger" + triggeritem).upper()) return message def bot_message_decipher(self, bot, trigger, aiml_response): diff --git a/sopel_modules/SpiceBot_AI/AI_aiml.py b/sopel_modules/SpiceBot_AI/AI_aiml.py index 2b4e4c2..278b7ff 100644 --- a/sopel_modules/SpiceBot_AI/AI_aiml.py +++ b/sopel_modules/SpiceBot_AI/AI_aiml.py @@ -6,9 +6,11 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot +import spicemanip + @sopel.module.rule('(.*)') -def bot_command_nick(bot, trigger): +def bot_command_rule(bot, trigger): # TODO add config limits # but still allow in privmsg @@ -25,6 +27,15 @@ def bot_command_nick(bot, trigger): if str(message).startswith(tuple(bot.config.core.prefix_list)): return + if str(message).lower().startswith(str(bot.nick).lower()): + trigger_args, trigger_command = SpiceBot.prerun.trigger_args(trigger.args[1], 'nickname') + + if trigger_command in SpiceBot.commands.dict['commands']["nickname"].keys(): + return + + trigger_args.insert(0, bot.nick) + message = spicemanip.main(trigger_args, 0).lower() + returnmessage = SpiceBot.botai.on_message(bot, trigger, message) if returnmessage: bot.osd(str(returnmessage))