From 629dcb4f9642b53ff6e0a5e1e40dfb3d74b28424 Mon Sep 17 00:00:00 2001
From: deathbybandaid <sam@deathbybandaid.net>
Date: Mon, 24 Jun 2019 10:42:52 -0400
Subject: [PATCH] exit versus quit

---
 sopel_modules/SpiceBot/Prerun.py | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py
index 9ab2d01..bf35a42 100644
--- a/sopel_modules/SpiceBot/Prerun.py
+++ b/sopel_modules/SpiceBot/Prerun.py
@@ -40,24 +40,11 @@ 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 = self.trigger_argsdict_single(argsdict_default, trigger_args)
+                argsdict_list = self.trigger_argsdict_list(argsdict_default, and_split)
 
-                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):
-                        function(bot, trigger, *args, **kwargs)
-                else:
-                    self.trigger_hyphen_arg_handler(bot, trigger)
-                quit()
-
-                """
                 # Run the function for all splits
                 for argsdict in argsdict_list:
                     trigger.sb = copy.deepcopy(argsdict)
@@ -69,8 +56,7 @@ class BotPrerun():
                             function(bot, trigger, *args, **kwargs)
                     else:
                         self.trigger_hyphen_arg_handler(bot, trigger)
-                quit()
-                """
+                exit()
             return internal_prerun
         return actual_decorator
 
@@ -103,16 +89,6 @@ 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