From cc375958f662e7354870ec1328297b5cc48cd675 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Sat, 12 Feb 2022 13:07:50 -0500 Subject: [PATCH] test --- sopel_SpiceBot_Core_Prerun/__init__.py | 30 +++++++++++--------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index 4fc149f..5f3f4a4 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -11,7 +11,7 @@ def get_commands(bot, trigger): # Get && split for multiple commands if "&&" in trigger.args[1]: - triggers = trigger.args[1].split("&&") + triggers = [x.strip() for x in trigger.args[1].split("&&")] else: triggers = [trigger.args[1]] @@ -38,33 +38,29 @@ def get_commands(bot, trigger): for trigger_item in triggers: - bot.say(trigger_item) - trigger_str = trigger_item.strip() - bot.say(trigger_str) - if trigger_item.startswith(tuple(sb.config.prefix_list)): trigger_type = "command" - trigger_prefix = trigger_str[0] - trigger_str = trigger_str[1:] - elif trigger_str.startswith(bot.nick): + trigger_prefix = trigger_item[0] + trigger_str = trigger_item[1:] + elif trigger_item.startswith(bot.nick): trigger_type = "nickname_command" - trigger_prefix = str(trigger_str.split(" ")[0]) - trigger_str = str(trigger_str.split(" ")[1:]) + trigger_prefix = str(trigger_item.split(" ")[0]) + trigger_str = str(trigger_item.split(" ")[1:]) elif trigger_str.startswith(tuple(["ACTION", "/me"])): first_trigger_type = "action_command" first_trigger_prefix = "ACTION" - trigger_str = trigger_str + trigger_str = trigger_item else: # Assume same command type until proven otherwise trigger_type = first_trigger_type trigger_prefix = first_trigger_prefix - trigger_str = trigger_str + trigger_str = trigger_item - commands.append({ - "trigger_type": trigger_type, - "trigger_prefix": trigger_prefix, - "trigger_str": trigger_str - }) + commands.append({ + "trigger_type": trigger_type, + "trigger_prefix": trigger_prefix, + "trigger_str": trigger_str + }) bot.say(str(commands))