deathbybandaid/SpiceBot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
deathbybandaid 2022-02-23 11:54:29 -05:00
parent 19f49ea5a7
commit f48ea07393
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sopel_SpiceBot_Core_1/SBCore/commands/__init__.py
View File

@ -82,7 +82,7 @@ class Commands():
# @time=2022-02-23T15:04:01.447Z : # @time=2022-02-23T15:04:01.447Z :
pretrigger = PreTrigger( pretrigger = PreTrigger(
self.bot.nick, self.bot.nick,
"%s :%s %s %s :%s%s %s" % ("", "@time=%s :%s %s %s :%s%s %s" % (trigger_dict["trigger_time"],
trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"]) trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"])
) )
@ -91,7 +91,8 @@ class Commands():
def generate_pretrigger_nickname_command(self, trigger_dict): def generate_pretrigger_nickname_command(self, trigger_dict):
pretrigger = PreTrigger( pretrigger = PreTrigger(
self.bot.nick, self.bot.nick,
":%s %s %s :%s %s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], "@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"]) trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"])
) )
return pretrigger return pretrigger
@ -99,7 +100,8 @@ class Commands():
def generate_pretrigger_action_command(self, trigger_dict): def generate_pretrigger_action_command(self, trigger_dict):
pretrigger = PreTrigger( pretrigger = PreTrigger(
self.bot.nick, self.bot.nick,
":%s %s %s :%s%s %s%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"], "@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") "\x01", "ACTION", trigger_dict["trigger_command"], trigger_dict["trigger_str"], "\x01")
) )
return pretrigger return pretrigger
@ -148,7 +150,7 @@ class Commands():
"trigger_command": first_trigger_command, "trigger_command": first_trigger_command,
"trigger_hostmask": trigger.hostmask, "trigger_hostmask": trigger.hostmask,
"trigger_sender": trigger.sender, "trigger_sender": trigger.sender,
"trigger_time": trigger.time "trigger_time": str(trigger.time)
}) })
for full_trigger_str in triggers: for full_trigger_str in triggers:
@ -218,7 +220,7 @@ class Commands():
"trigger_command": trigger_command, "trigger_command": trigger_command,
"trigger_hostmask": trigger.hostmask, "trigger_hostmask": trigger.hostmask,
"trigger_sender": trigger.sender, "trigger_sender": trigger.sender,
"trigger_time": trigger.time "trigger_time": str(trigger.time)
}) })
return commands return commands

5
sopel_SpiceBot_Core_Prerun/validate_trigger.py
View File

@ -6,8 +6,6 @@ from sopel_SpiceBot_Core_1 import sb
def validate_trigger(trigger, trigger_dict): def validate_trigger(trigger, trigger_dict):
redispatch = False redispatch = False
trigger_time = trigger.time
if trigger_dict["trigger_type"] == "command": if trigger_dict["trigger_type"] == "command":
trigger._pretrigger = sb.commands.generate_pretrigger_command(trigger_dict) trigger._pretrigger = sb.commands.generate_pretrigger_command(trigger_dict)
elif trigger_dict["trigger_type"] == "nickname_command": elif trigger_dict["trigger_type"] == "nickname_command":
@ -15,6 +13,7 @@ def validate_trigger(trigger, trigger_dict):
elif trigger_dict["trigger_type"] == "action_command": elif trigger_dict["trigger_type"] == "action_command":
trigger._pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict) trigger._pretrigger = sb.commands.generate_pretrigger_action_command(trigger_dict)
trigger._pretrigger.time = trigger_time trigger._match = None
print(trigger.groups)
return trigger, redispatch return trigger, redispatch