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

prepend user nickname to command error messages

Browse source
This commit is contained in:
jesopo 2019-11-11 13:26:14 +00:00
parent 9fa128fcc9
commit 7d1cdd2251
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/commands/__init__.py
View file

@ -164,13 +164,13 @@ class Module(ModuleManager.BaseModule):
return True, None return True, None
def _check_assert(self, check_kwargs, def _check_assert(self, check_kwargs, user,
check: typing.Union[utils.Check, utils.MultiCheck]): check: typing.Union[utils.Check, utils.MultiCheck]):
checks = check.to_multi() # both Check and MultiCheck has this func checks = check.to_multi() # both Check and MultiCheck has this func
is_success, message = self._check("check", check_kwargs, is_success, message = self._check("check", check_kwargs,
checks.requests()) checks.requests())
if not is_success: if not is_success:
raise utils.EventError(message) raise utils.EventError("%s: %s" % (user.nickname, message))
def _tagmsg(self, target, tags): def _tagmsg(self, target, tags):
return IRCLine.ParsedLine("TAGMSG", [target], tags=tags) return IRCLine.ParsedLine("TAGMSG", [target], tags=tags)
@ -211,13 +211,15 @@ class Module(ModuleManager.BaseModule):
"stderr": stderr} "stderr": stderr}
event_kwargs.update(kwargs) event_kwargs.update(kwargs)
check_assert = lambda check: self._check_assert(event_kwargs, check) check_assert = lambda check: self._check_assert(event_kwargs, user,
check)
event_kwargs["check_assert"] = check_assert event_kwargs["check_assert"] = check_assert
check_success, check_message = self._check("preprocess", event_kwargs) check_success, check_message = self._check("preprocess", event_kwargs)
if not check_success: if not check_success:
if check_message: if check_message:
stderr.write(check_message).send(command_method) stderr.write("%s: %s" % (user.nickname, check_message)
).send(command_method)
return True return True
new_event = self.events.on(hook.event_name).make_event(**event_kwargs) new_event = self.events.on(hook.event_name).make_event(**event_kwargs)