From f48ea073938555f857c94b45693beeb6f681b709 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 23 Feb 2022 11:54:29 -0500 Subject: [PATCH] test --- .../SBCore/commands/__init__.py | 20 ++++++++++--------- .../validate_trigger.py | 5 ++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py index 6773494..481355d 100644 --- a/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py +++ b/sopel_SpiceBot_Core_1/SBCore/commands/__init__.py @@ -82,25 +82,27 @@ class Commands(): # @time=2022-02-23T15:04:01.447Z : pretrigger = PreTrigger( self.bot.nick, - "%s :%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"]) + "@time=%s :%s %s %s :%s%s %s" % (trigger_dict["trigger_time"], + trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) ) return pretrigger def generate_pretrigger_nickname_command(self, trigger_dict): pretrigger = PreTrigger( self.bot.nick, - ":%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"]) + "@time=%s :%s %s %s :%s %s %s" % (trigger_dict["trigger_time"], + trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) ) return pretrigger def generate_pretrigger_action_command(self, trigger_dict): pretrigger = PreTrigger( self.bot.nick, - ":%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") + "@time=%s :%s %s %s :%s%s %s%s %s" % (trigger_dict["trigger_time"], + trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], + "\x01", "ACTION", trigger_dict["trigger_command"], trigger_dict["trigger_str"], "\x01") ) return pretrigger @@ -148,7 +150,7 @@ class Commands(): "trigger_command": first_trigger_command, "trigger_hostmask": trigger.hostmask, "trigger_sender": trigger.sender, - "trigger_time": trigger.time + "trigger_time": str(trigger.time) }) for full_trigger_str in triggers: @@ -218,7 +220,7 @@ class Commands(): "trigger_command": trigger_command, "trigger_hostmask": trigger.hostmask, "trigger_sender": trigger.sender, - "trigger_time": trigger.time + "trigger_time": str(trigger.time) }) return commands diff --git a/sopel_SpiceBot_Core_Prerun/validate_trigger.py b/sopel_SpiceBot_Core_Prerun/validate_trigger.py index e379284..fb85a5f 100644 --- a/sopel_SpiceBot_Core_Prerun/validate_trigger.py +++ b/sopel_SpiceBot_Core_Prerun/validate_trigger.py @@ -6,8 +6,6 @@ from sopel_SpiceBot_Core_1 import sb def validate_trigger(trigger, trigger_dict): redispatch = False - trigger_time = trigger.time - if trigger_dict["trigger_type"] == "command": trigger._pretrigger = sb.commands.generate_pretrigger_command(trigger_dict) elif trigger_dict["trigger_type"] == "nickname_command": @@ -15,6 +13,7 @@ def validate_trigger(trigger, trigger_dict): elif trigger_dict["trigger_type"] == "action_command": trigger._pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict) - trigger._pretrigger.time = trigger_time + trigger._match = None + print(trigger.groups) return trigger, redispatch