From 295a05470eb20010320dc125da3dc250f101a2b9 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 22 Feb 2022 13:38:21 -0500 Subject: [PATCH] test --- sopel_SpiceBot_Core_1/SBCore/commands/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py index bb95d30..8211063 100644 --- a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py @@ -80,24 +80,24 @@ class Commands(): def dispatch_command(self, trigger_dict): pretrigger = PreTrigger( self.bot.nick, - ":%s %s %s :%s%s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], - trigger_dict["trigger_prefix"], trigger_dict["trigger_str"]) + ":%s %s %s :%s%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) ) self.bot.dispatch(pretrigger) def dispatch_nickname_command(self, trigger_dict): pretrigger = PreTrigger( self.bot.nick, - ":%s %s %s :%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], - trigger_dict["trigger_prefix"], trigger_dict["trigger_str"]) + ":%s %s %s :%s %s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) ) self.bot.dispatch(pretrigger) def dispatch_action_command(self, trigger_dict): pretrigger = PreTrigger( self.bot.nick, - ":%s %s %s :%s%s %s%s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], - "\x01", "ACTION", trigger_dict["trigger_str"], "\x01") + ":%s %s %s :%s%s %s%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + "\x01", "ACTION", trigger_dict["trigger_command"], trigger_dict["trigger_str"], "\x01") ) self.bot.dispatch(pretrigger) @@ -130,11 +130,12 @@ class Commands(): first_trigger_prefix = None first_command = first_trigger.split(" ")[0] + first_str = " ".join(first_trigger.split(" ")[1:]) commands.append({ "trigger_type": first_trigger_type, "trigger_prefix": first_trigger_prefix, - "trigger_str": first_trigger, + "trigger_str": first_str, "trigger_command": first_command, "trigger_hostmask": trigger.hostmask, "trigger_sender": trigger.sender