Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-06 01:24:05 +01:00
Code Issues Projects Releases Wiki Activity

Fixed replyNoCapability messages to be in private.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-10-03 10:04:40 +00:00
parent 36984d3fa5
commit 1e64fad163
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/callbacks.py
View File

@ -337,7 +337,8 @@ class IrcObjectProxy:
#debug.printf('Being prevented with anticap') #debug.printf('Being prevented with anticap')
debug.msg('Preventing %s from calling %s' % \ debug.msg('Preventing %s from calling %s' % \
(self.msg.nick, name), 'normal') (self.msg.nick, name), 'normal')
self.error(self.msg, conf.replyNoCapability % name) s = conf.replyNoCapability % name
self.error(self.msg, s, private=True)
return return
recipient = self.msg.args[0] recipient = self.msg.args[0]
if ircutils.isChannel(recipient): if ircutils.isChannel(recipient):
@ -347,7 +348,8 @@ class IrcObjectProxy:
#debug.printf('Being prevented with chancap') #debug.printf('Being prevented with chancap')
debug.msg('Preventing %s from calling %s' % \ debug.msg('Preventing %s from calling %s' % \
(self.msg.nick, name), 'normal') (self.msg.nick, name), 'normal')
self.error(self.msg, conf.replyNoCapability % name) s = conf.replyNoCapability % name
self.error(self.msg, s, private=True)
return return
command = getattr(cb, name) command = getattr(cb, name)
if cb.threaded: if cb.threaded:
@ -507,10 +509,10 @@ class ConfigIrcProxy(object):
def __init__(self, irc): def __init__(self, irc):
self.__dict__['irc'] = irc self.__dict__['irc'] = irc
def reply(self, msg, s): def reply(self, msg, s, *args):
return None return None
def error(self, msg, s): def error(self, msg, s, *args):
debug.msg('ConfigIrcProxy saw an error: %s' % s, 'normal') debug.msg('ConfigIrcProxy saw an error: %s' % s, 'normal')
findCallback = IrcObjectProxy.findCallback.im_func findCallback = IrcObjectProxy.findCallback.im_func
@ -621,8 +623,9 @@ class IrcObjectProxyRegexp:
def __init__(self, irc, *args): def __init__(self, irc, *args):
self.irc = irc self.irc = irc
def error(self, msg, s): def error(self, msg, s, private=False):
self.reply(msg, 'Error: ' + s) private = private or conf.errorReplyPrivate
self.reply(msg, 'Error: ' + s, private=private)
def reply(self, msg, s, prefixName=True, action=False, private=False,): def reply(self, msg, s, prefixName=True, action=False, private=False,):
if action: if action:

9
test/test_callbacks.py
View File

@ -167,6 +167,15 @@ class PrivmsgTestCase(ChannelPluginTestCase):
self.assertResponse("eval irc.reply(msg, 'foo', action=True)", self.assertResponse("eval irc.reply(msg, 'foo', action=True)",
'\x01ACTION foo\x01') '\x01ACTION foo\x01')
def testErrorPrivateKwarg(self):
try:
originalConfErrorReplyPrivate = conf.errorReplyPrivate
conf.errorReplyPrivate = False
m = self.getMsg("eval irc.error(msg, 'foo', private=True)")
self.failIf(ircutils.isChannel(m.args[0]))
finally:
conf.errorReplyPrivate = originalConfErrorReplyPrivate
def testErrorReplyPrivate(self): def testErrorReplyPrivate(self):
try: try:
originalConfErrorReplyPrivate = conf.errorReplyPrivate originalConfErrorReplyPrivate = conf.errorReplyPrivate