From f9ae21dd3933c8debdab9bcffe5f702c41536536 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 23 Feb 2022 12:24:52 -0500 Subject: [PATCH] test --- sopel_SpiceBot_Core_Prerun/__init__.py | 2 +- sopel_SpiceBot_Core_Prerun/validate_trigger.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py index 4d5c8e7..3bce1f9 100644 --- a/sopel_SpiceBot_Core_Prerun/__init__.py +++ b/sopel_SpiceBot_Core_Prerun/__init__.py @@ -34,7 +34,7 @@ def prerun(rulematch=False): # This is where we rebuild trigger # we validate a few things here - trigger = validate_trigger(trigger, commands[0]) + trigger = validate_trigger(bot, trigger, commands[0]) # Get list of trigger command(s) by | split commands = sb.commands.get_commands_split(trigger, "|") diff --git a/sopel_SpiceBot_Core_Prerun/validate_trigger.py b/sopel_SpiceBot_Core_Prerun/validate_trigger.py index f4c4b7e..a400714 100644 --- a/sopel_SpiceBot_Core_Prerun/validate_trigger.py +++ b/sopel_SpiceBot_Core_Prerun/validate_trigger.py @@ -4,7 +4,7 @@ import sopel from sopel_SpiceBot_Core_1 import sb -def validate_trigger(trigger, trigger_dict): +def validate_trigger(bot, trigger, trigger_dict): print(trigger.group(0)) print(trigger.group(1)) @@ -17,7 +17,7 @@ def validate_trigger(trigger, trigger_dict): elif trigger_dict["trigger_type"] == "action_command": pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict) - matches = sopel.rules.get_triggered_rules(sopel, pretrigger) + matches = sopel.rules.get_triggered_rules(bot, pretrigger) print(matches) return trigger