From 0fc056bfd95493770a06260b4cc40c1822d2f78d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 9 May 2019 08:53:37 -0400 Subject: [PATCH] goodbye --- sopel_modules/SpiceBot_AI/AI.py | 41 +++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/sopel_modules/SpiceBot_AI/AI.py b/sopel_modules/SpiceBot_AI/AI.py index 19e0772..b0d1be6 100644 --- a/sopel_modules/SpiceBot_AI/AI.py +++ b/sopel_modules/SpiceBot_AI/AI.py @@ -62,21 +62,8 @@ def bot_command_damnlazy_b(bot, trigger): @sopel.module.nickname_commands('(.*)') def bot_command_nick(bot, trigger): - while not bot_events_check(bot, ['1004', '2002']): - pass - - triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') - - if not triggercommand: - return - - if triggercommand in bot.memory['SpiceBot_CommandsQuery']['commands']["nickname"].keys(): - return - triggerargs.insert(0, triggercommand) - - fulltrigger = spicemanip.main(triggerargs, 0).lower() - - if fulltrigger in bot.memory['SpiceBot_CommandsQuery']['nickrules']: + triggerargs, triggercommand, fulltrigger, canrun = bot_command_nick_setup(bot, trigger) + if not canrun: return if fulltrigger.lower().startswith("what is"): @@ -211,3 +198,27 @@ def bot_command_nick(bot, trigger): else: bot.osd("I don't know what you are asking me to do!") return + + +def bot_command_nick_setup(bot, trigger): + + while not bot_events_check(bot, ['1004', '2002']): + pass + + canrun = True + + triggerargs, triggercommand = sopel_triggerargs(bot, trigger, 'nickname_command') + + if not triggercommand: + return '', '', '', False + + if triggercommand in bot.memory['SpiceBot_CommandsQuery']['commands']["nickname"].keys(): + return + triggerargs.insert(0, triggercommand) + + fulltrigger = spicemanip.main(triggerargs, 0).lower() + + if fulltrigger in bot.memory['SpiceBot_CommandsQuery']['nickrules']: + return '', '', '', False + + return triggerargs, triggercommand, fulltrigger, canrun