test
This commit is contained in:
parent
c78d3c3198
commit
295a05470e
@ -80,24 +80,24 @@ class Commands():
|
|||||||
def dispatch_command(self, trigger_dict):
|
def dispatch_command(self, trigger_dict):
|
||||||
pretrigger = PreTrigger(
|
pretrigger = PreTrigger(
|
||||||
self.bot.nick,
|
self.bot.nick,
|
||||||
":%s %s %s :%s%s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
":%s %s %s :%s%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
||||||
trigger_dict["trigger_prefix"], trigger_dict["trigger_str"])
|
trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"])
|
||||||
)
|
)
|
||||||
self.bot.dispatch(pretrigger)
|
self.bot.dispatch(pretrigger)
|
||||||
|
|
||||||
def dispatch_nickname_command(self, trigger_dict):
|
def dispatch_nickname_command(self, trigger_dict):
|
||||||
pretrigger = PreTrigger(
|
pretrigger = PreTrigger(
|
||||||
self.bot.nick,
|
self.bot.nick,
|
||||||
":%s %s %s :%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
":%s %s %s :%s %s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
||||||
trigger_dict["trigger_prefix"], trigger_dict["trigger_str"])
|
trigger_dict["trigger_prefix"], trigger_dict["trigger_command"], trigger_dict["trigger_str"])
|
||||||
)
|
)
|
||||||
self.bot.dispatch(pretrigger)
|
self.bot.dispatch(pretrigger)
|
||||||
|
|
||||||
def dispatch_action_command(self, trigger_dict):
|
def dispatch_action_command(self, trigger_dict):
|
||||||
pretrigger = PreTrigger(
|
pretrigger = PreTrigger(
|
||||||
self.bot.nick,
|
self.bot.nick,
|
||||||
":%s %s %s :%s%s %s%s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
":%s %s %s :%s%s %s%s %s" % (trigger_dict["trigger_hostmask"], "PRIVMSG", trigger_dict["trigger_sender"],
|
||||||
"\x01", "ACTION", trigger_dict["trigger_str"], "\x01")
|
"\x01", "ACTION", trigger_dict["trigger_command"], trigger_dict["trigger_str"], "\x01")
|
||||||
)
|
)
|
||||||
self.bot.dispatch(pretrigger)
|
self.bot.dispatch(pretrigger)
|
||||||
|
|
||||||
@ -130,11 +130,12 @@ class Commands():
|
|||||||
first_trigger_prefix = None
|
first_trigger_prefix = None
|
||||||
|
|
||||||
first_command = first_trigger.split(" ")[0]
|
first_command = first_trigger.split(" ")[0]
|
||||||
|
first_str = " ".join(first_trigger.split(" ")[1:])
|
||||||
|
|
||||||
commands.append({
|
commands.append({
|
||||||
"trigger_type": first_trigger_type,
|
"trigger_type": first_trigger_type,
|
||||||
"trigger_prefix": first_trigger_prefix,
|
"trigger_prefix": first_trigger_prefix,
|
||||||
"trigger_str": first_trigger,
|
"trigger_str": first_str,
|
||||||
"trigger_command": first_command,
|
"trigger_command": first_command,
|
||||||
"trigger_hostmask": trigger.hostmask,
|
"trigger_hostmask": trigger.hostmask,
|
||||||
"trigger_sender": trigger.sender
|
"trigger_sender": trigger.sender
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user