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

Move logic to get command-method out of Out object (commands.py)

Browse source
This commit is contained in:
jesopo 2019-01-23 20:35:28 +00:00
parent 2c7c12e9e0
commit 64cb723901
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/commands.py
View file

@ -27,7 +27,7 @@ class Out(object):
self.written = True self.written = True
return self return self
def send(self): def send(self, method):
if self.has_text(): if self.has_text():
text = self._text text = self._text
text_encoded = text.encode("utf8") text_encoded = text.encode("utf8")
@ -47,16 +47,11 @@ class Out(object):
if not self._hide_prefix: if not self._hide_prefix:
prefix = utils.consts.RESET + "[%s] " % self.prefix() prefix = utils.consts.RESET + "[%s] " % self.prefix()
method = self._get_method()
if method == "PRIVMSG": if method == "PRIVMSG":
self.target.send_message(text, prefix=prefix, tags=tags) self.target.send_message(text, prefix=prefix, tags=tags)
elif method == "NOTICE": elif method == "NOTICE":
self.target.send_notice(text, prefix=prefix, tags=tags) self.target.send_notice(text, prefix=prefix, tags=tags)
def _get_method(self):
return self.target.get_setting(COMMAND_METHOD,
self.server.get_setting(COMMAND_METHOD, "PRIVMSG")).upper()
def set_prefix(self, prefix): def set_prefix(self, prefix):
self.module_name = prefix self.module_name = prefix
def hide_prefix(self): def hide_prefix(self):
@ -65,7 +60,6 @@ class Out(object):
def has_text(self): def has_text(self):
return bool(self._text) return bool(self._text)
class StdOut(Out): class StdOut(Out):
def prefix(self): def prefix(self):
return utils.irc.color(self.module_name, utils.consts.GREEN) return utils.irc.color(self.module_name, utils.consts.GREEN)
@ -123,6 +117,10 @@ class Module(ModuleManager.BaseModule):
def _set_aliases(self, server, aliases): def _set_aliases(self, server, aliases):
server.set_setting("command-aliases", aliases) server.set_setting("command-aliases", aliases)
def _command_method(self, target, server):
return target.get_setting(COMMAND_METHOD,
server.get_setting(COMMAND_METHOD, "PRIVMSG")).upper()
def message(self, event, command, args_index=1): def message(self, event, command, args_index=1):
args_split = event["message_split"][args_index:] args_split = event["message_split"][args_index:]
if not self.has_command(command): if not self.has_command(command):
@ -169,6 +167,7 @@ class Module(ModuleManager.BaseModule):
msgid = event["tags"].get("draft/msgid", None) msgid = event["tags"].get("draft/msgid", None)
stdout = StdOut(event["server"], module_name, target, msgid) stdout = StdOut(event["server"], module_name, target, msgid)
stderr = StdErr(event["server"], module_name, target, msgid) stderr = StdErr(event["server"], module_name, target, msgid)
command_method = self._command_method(target, event["server"])
returns = self.events.on("preprocess.command").call_unsafe( returns = self.events.on("preprocess.command").call_unsafe(
hook=hook, user=event["user"], server=event["server"], hook=hook, user=event["user"], server=event["server"],
@ -180,7 +179,7 @@ class Module(ModuleManager.BaseModule):
return return
if returned: if returned:
# error message # error message
stderr.write(returned).send() stderr.write(returned).send(command_method)
target.buffer.skip_next() target.buffer.skip_next()
return return
@ -192,10 +191,10 @@ class Module(ModuleManager.BaseModule):
usage = self._get_usage(hook, command) usage = self._get_usage(hook, command)
if usage: if usage:
stderr.write("Not enough arguments, usage: %s" % stderr.write("Not enough arguments, usage: %s" %
usage).send() usage).send(command_method)
else: else:
stderr.write("Not enough arguments (minimum: %d)" % stderr.write("Not enough arguments (minimum: %d)" %
min_args).send() min_args).send(command_method)
else: else:
args = " ".join(args_split) args = " ".join(args_split)
server = event["server"] server = event["server"]
@ -210,8 +209,10 @@ class Module(ModuleManager.BaseModule):
stderr.write(str(e)) stderr.write(str(e))
if not hook.kwargs.get("skip_out", False): if not hook.kwargs.get("skip_out", False):
stdout.send() command_method = self._command_method(
stderr.send() target, event["server"])
stdout.send(command_method)
stderr.send(command_method)
target.last_stdout = stdout target.last_stdout = stdout
target.last_stderr = stderr target.last_stderr = stderr
target.buffer.skip_next() target.buffer.skip_next()