diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index 5dde9ab..4d5c8e7 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -34,7 +34,10 @@ def prerun(rulematch=False): # This is where we rebuild trigger # we validate a few things here - trigger, redispatch = validate_trigger(trigger, commands[0]) + trigger = validate_trigger(trigger, commands[0]) + + # Get list of trigger command(s) by | split + commands = sb.commands.get_commands_split(trigger, "|") # Now we have a single valid command # we are going to validate the command diff --git a/sopel_SpiceBot_Core_Prerun/validate_trigger.py b/sopel_SpiceBot_Core_Prerun/validate_trigger.py index 7c25613..f4c4b7e 100644 --- a/sopel_SpiceBot_Core_Prerun/validate_trigger.py +++ b/sopel_SpiceBot_Core_Prerun/validate_trigger.py @@ -1,24 +1,23 @@ +import sopel from sopel_SpiceBot_Core_1 import sb def validate_trigger(trigger, trigger_dict): - redispatch = False print(trigger.group(0)) print(trigger.group(1)) print(trigger.args) if trigger_dict["trigger_type"] == "command": - trigger._pretrigger = sb.commands.generate_pretrigger_command(trigger_dict) + pretrigger = sb.commands.generate_pretrigger_command(trigger_dict) elif trigger_dict["trigger_type"] == "nickname_command": - trigger._pretrigger = sb.commands.generate_pretrigger_nickname_command(trigger_dict) + pretrigger = sb.commands.generate_pretrigger_nickname_command(trigger_dict) elif trigger_dict["trigger_type"] == "action_command": - trigger._pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict) + pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict) - print(trigger.group(0)) - print(trigger.group(1)) - print(trigger.args) + matches = sopel.rules.get_triggered_rules(sopel, pretrigger) + print(matches) - return trigger, redispatch + return trigger