From 9485c4cbde511314bb0e0fa07e3318c4d4193bcc Mon Sep 17 00:00:00 2001
From: deathbybandaid <sam@deathbybandaid.net>
Date: Mon, 24 Jun 2019 10:57:38 -0400
Subject: [PATCH] test

---
 sopel_modules/SpiceBot/Prerun.py | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py
index 0a0e9dc..d3d2bac 100644
--- a/sopel_modules/SpiceBot/Prerun.py
+++ b/sopel_modules/SpiceBot/Prerun.py
@@ -40,12 +40,23 @@ class BotPrerun():
                 argsdict_default["realcom"] = realcom
 
                 # split into && groupings
-                and_split = self.trigger_and_split(trigger_args)
+                # and_split = self.trigger_and_split(trigger_args)
 
                 # Create dict listings for trigger.sb
-                argsdict_list = self.trigger_argsdict_list(argsdict_default, and_split)
+                # argsdict_list = self.trigger_argsdict_list(argsdict_default, and_split)
+                argsdict = self.trigger_argsdict_single(argsdict_default, trigger_args)
 
-                # Run the function for all splits
+                trigger.sb = copy.deepcopy(argsdict)
+
+                trigger.sb["args"], trigger.sb["hyphen_arg"] = self.trigger_hyphen_args(trigger.sb["args"])
+                if not trigger.sb["hyphen_arg"]:
+                    # check if anything prohibits the nick from running the command
+                    if self.trigger_runstatus(bot, trigger):
+                        return function(bot, trigger, *args, **kwargs)
+                else:
+                    return self.trigger_hyphen_arg_handler(bot, trigger)
+
+                """# Run the function for all splits
                 for argsdict in argsdict_list:
                     trigger.sb = copy.deepcopy(argsdict)
 
@@ -56,8 +67,8 @@ class BotPrerun():
                             function(bot, trigger, *args, **kwargs)
                     else:
                         self.trigger_hyphen_arg_handler(bot, trigger)
+                """
             return internal_prerun
-            quit()
         return actual_decorator
 
     def trigger_args(self, triggerargs_one, trigger_command_type='module'):
@@ -89,6 +100,16 @@ class BotPrerun():
             prerun_split.append(argsdict_part)
         return prerun_split
 
+    def trigger_argsdict_single(self, argsdict_default, trigger_args_part):
+        argsdict_part = copy.deepcopy(argsdict_default)
+        argsdict_part["args"] = spicemanip.main(trigger_args_part, 'create')
+        if len(argsdict_part["args"]) and argsdict_part["args"][0] == "-a":
+            argsdict_part["adminswitch"] = True
+            argsdict_part["args"] = spicemanip.main(argsdict_part["args"], '2+', 'list')
+        else:
+            argsdict_part["adminswitch"] = False
+        return argsdict_part
+
     def trigger_runstatus(self, bot, trigger):
 
         # Bots can't run commands