From 4f652091b3181291419f906ac5f4b949fc6c052c Mon Sep 17 00:00:00 2001
From: deathbybandaid <github@deathbybandaid.net>
Date: Wed, 23 Feb 2022 12:34:42 -0500
Subject: [PATCH] test

---
 sopel_SpiceBot_Core_Prerun/__init__.py                    | 4 ++--
 .../{validate_trigger.py => clean_trigger.py}             | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename sopel_SpiceBot_Core_Prerun/{validate_trigger.py => clean_trigger.py} (77%)

diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py
index 3bce1f9..a39ca38 100644
--- a/sopel_SpiceBot_Core_Prerun/__init__.py
+++ b/sopel_SpiceBot_Core_Prerun/__init__.py
@@ -3,7 +3,7 @@ import functools
 from sopel_SpiceBot_Core_1 import sb
 
 from .comrun import ComRun
-from .validate_trigger import validate_trigger
+from .clean_trigger import clean_trigger
 # from .validate_command import validate_command
 # from .dispatch_multi import dispatch_multi
 # from .pipe_split import pipe_split
@@ -34,7 +34,7 @@ def prerun(rulematch=False):
 
             # This is where we rebuild trigger
             # we validate a few things here
-            trigger = validate_trigger(bot, trigger, commands[0])
+            trigger = clean_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/clean_trigger.py
similarity index 77%
rename from sopel_SpiceBot_Core_Prerun/validate_trigger.py
rename to sopel_SpiceBot_Core_Prerun/clean_trigger.py
index a400714..179026f 100644
--- a/sopel_SpiceBot_Core_Prerun/validate_trigger.py
+++ b/sopel_SpiceBot_Core_Prerun/clean_trigger.py
@@ -1,10 +1,10 @@
 
-import sopel
 
 from sopel_SpiceBot_Core_1 import sb
 
 
-def validate_trigger(bot, trigger, trigger_dict):
+def clean_trigger(bot, trigger, trigger_dict):
+    redispatch = False
 
     print(trigger.group(0))
     print(trigger.group(1))
@@ -17,7 +17,7 @@ def validate_trigger(bot, 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(bot, pretrigger)
+    matches = bot.rules.get_triggered_rules(bot, pretrigger)
     print(matches)
 
-    return trigger
+    return trigger, redispatch