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

Add ability to hide [Prefix] from command outputs

Browse source
This commit is contained in:
jesopo 2018-11-07 11:27:10 +00:00
parent 4000479cf0
commit 1696492a78
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/commands.py
View file

@ -15,6 +15,7 @@ class Out(object):
def __init__(self, server, module_name, target, msgid): def __init__(self, server, module_name, target, msgid):
self.server = server self.server = server
self.module_name = module_name self.module_name = module_name
self._hide_prefix = False
self.target = target self.target = target
self._text = "" self._text = ""
self.written = False self.written = False
@ -41,7 +42,10 @@ class Out(object):
if self._msgid: if self._msgid:
tags["+draft/reply"] = self._msgid tags["+draft/reply"] = self._msgid
prefix = utils.irc.FONT_RESET + "[%s] " % self.prefix() prefix = ""
if not self._hide_prefix:
prefix = utils.irc.FONT_RESET + "[%s] " % self.prefix()
method = self._get_method() 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)
@ -54,10 +58,13 @@ class Out(object):
def set_prefix(self, prefix): def set_prefix(self, prefix):
self.module_name = prefix self.module_name = prefix
def hide_prefix(self):
self._hide_prefix = True
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(utils.irc.bold(self.module_name), return utils.irc.color(utils.irc.bold(self.module_name),
@ -81,6 +88,9 @@ def _command_method_validate(s):
@utils.export("channelset", {"setting": "command-method", @utils.export("channelset", {"setting": "command-method",
"help": "Set the method used to respond to commands", "help": "Set the method used to respond to commands",
"validate": _command_method_validate}) "validate": _command_method_validate})
@utils.export("channelset", {"setting": "hide-prefix",
"help": "Disable/enable hiding prefix in command reponses",
"validate": utils.bool_or_none})
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
@utils.hook("new.user|channel") @utils.hook("new.user|channel")
def new(self, event): def new(self, event):
@ -317,6 +327,10 @@ class Module(ModuleManager.BaseModule):
def send_stdout(self, event): def send_stdout(self, event):
stdout = StdOut(event["server"], event["module_name"], stdout = StdOut(event["server"], event["module_name"],
event["target"], event.get("msgid", None)) event["target"], event.get("msgid", None))
if event.get("hide_prefix", False):
stdout.hide_prefix()
stdout.write(event["message"]).send() stdout.write(event["message"]).send()
if stdout.has_text(): if stdout.has_text():
event["target"].last_stdout = stdout event["target"].last_stdout = stdout
@ -324,6 +338,10 @@ class Module(ModuleManager.BaseModule):
def send_stderr(self, event): def send_stderr(self, event):
stderr = StdErr(event["server"], event["module_name"], stderr = StdErr(event["server"], event["module_name"],
event["target"], event.get("msgid", None)) event["target"], event.get("msgid", None))
if event.get("hide_prefix", False):
stderr.hide_prefix()
stderr.write(event["message"]).send() stderr.write(event["message"]).send()
if stderr.has_text(): if stderr.has_text():
event["target"].last_stderr = stderr event["target"].last_stderr = stderr