Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

made channel commands prefixable with the bot's nickname, not just the command prefix.

Browse source
This commit is contained in:
jesopo 2016-03-30 12:49:46 +01:00
parent 488a869ba7
commit dc24b6b680
No known key found for this signature in database
GPG key ID: 0BBDEB2AEFCFFCB3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/commands.py
View file

@ -1,4 +1,3 @@
STR_MORE = " (more...)" STR_MORE = " (more...)"
STR_CONTINUED = "(...continued) " STR_CONTINUED = "(...continued) "
@ -66,7 +65,12 @@ class Module(object):
return self.bot.events.on("received").on("command").on(command return self.bot.events.on("received").on("command").on(command
).get_hooks()[0] ).get_hooks()[0]
def message(self, event, command): def is_highlight(self, server, s):
return s.lower() == server.nickname_lower or (s.lower().startswith(
server.nickname_lower) and len(s) == len(server.nickname_lower
)+1 and s[-1] in [":", ","])
def message(self, event, command, args_index=1):
if self.has_command(command): if self.has_command(command):
hook = self.get_hook(command) hook = self.get_hook(command)
is_channel = False is_channel = False
@ -92,7 +96,7 @@ class Module(object):
if returned: if returned:
stderr.write(returned).send() stderr.write(returned).send()
return return
args_split = list(filter(None, event["message_split"][1:])) args_split = list(filter(None, event["message_split"][args_index:]))
min_args = hook.kwargs.get("min_args") min_args = hook.kwargs.get("min_args")
if min_args and len(args_split) < min_args: if min_args and len(args_split) < min_args:
stderr.write("Not enough arguments (minimum: %d)" % min_args stderr.write("Not enough arguments (minimum: %d)" % min_args
@ -117,6 +121,10 @@ class Module(object):
command = event["message_split"][0].replace( command = event["message_split"][0].replace(
command_prefix, "", 1).lower() command_prefix, "", 1).lower()
self.message(event, command) self.message(event, command)
elif len(event["message_split"]) > 1 and self.is_highlight(
event["server"], event["message_split"][0]):
command = event["message_split"][1].lower()
self.message(event, command, 2)
def private_message(self, event): def private_message(self, event):
if event["message_split"]: if event["message_split"]: