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

check stdout/stderr has_text() before .send() gets rid of it

Browse source
This commit is contained in:
jesopo 2019-06-07 16:21:19 +01:00
parent b1d07859c3
commit 321bd7acf4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/commands/__init__.py
View file

@ -157,6 +157,7 @@ class Module(ModuleManager.BaseModule):
command_method = self._command_method(target, server) command_method = self._command_method(target, server)
ret = False ret = False
had_out = False
if hook.kwargs.get("remove_empty", True): if hook.kwargs.get("remove_empty", True):
args_split = list(filter(None, args_split)) args_split = list(filter(None, args_split))
@ -211,6 +212,7 @@ 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):
had_out = stdout.has_text() or stderr.has_text()
command_method = self._command_method(target, server) command_method = self._command_method(target, server)
stdout.send(command_method) stdout.send(command_method)
stderr.send(command_method) stderr.send(command_method)
@ -218,8 +220,7 @@ class Module(ModuleManager.BaseModule):
target.last_stderr = stderr target.last_stderr = stderr
ret = new_event.eaten ret = new_event.eaten
if (expect_output and message_tags and not stdout.has_text() and if expect_output and message_tags and not had_out:
not stderr.has_text()):
server.send(utils.irc.protocol.tagmsg(target_str, server.send(utils.irc.protocol.tagmsg(target_str,
{"+draft/typing": "done"}), immediate=True) {"+draft/typing": "done"}), immediate=True)