From 693ba6aba08a0a06018adc2e6a50b363deaee7f6 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Wed, 22 Jun 2011 21:37:34 +0200 Subject: [PATCH] Don't tell owner to contact an admin. Closes GH-20. --- src/callbacks.py | 6 +++++- src/conf.py | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/callbacks.py b/src/callbacks.py index 35bd21973..3a2eb7fe0 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -423,6 +423,10 @@ def replySuccess(self, s='', **kwargs): def replyError(self, s='', **kwargs): v = self._getConfig(conf.supybot.replies.error) + if 'msg' in kwargs: + msg = kwargs['msg'] + if ircdb.checkCapability(msg.prefix, 'owner'): + v = self._getConfig(conf.supybot.replies.errorOwner) s = self.__makeReply(v, s) return self.reply(s, **kwargs) @@ -1205,7 +1209,7 @@ def _callCommand(self, command, irc, msg, *args, **kwargs): if conf.supybot.reply.error.detailed(): irc.error(utils.exnToString(e)) else: - irc.replyError() + irc.replyError(msg=msg) def getCommandHelp(self, command, simpleSyntax=None): method = self.getCommandMethod(command) diff --git a/src/conf.py b/src/conf.py index b17107555..e0eed8890 100644 --- a/src/conf.py +++ b/src/conf.py @@ -484,6 +484,11 @@ def setValue(self, v): Determines what error message the bot gives when it wants to be ambiguous."""))) +registerChannelValue(supybot.replies, 'errorOwner', + registry.NormalizedString(_("""An error has occurred and has been logged. + Check the logs for more informations."""), _("""Determines what error + message the bot gives to the owner when it wants to be ambiguous."""))) + registerChannelValue(supybot.replies, 'incorrectAuthentication', registry.NormalizedString(_("""Your hostmask doesn't match or your password is wrong."""), _("""Determines what message the bot replies with when