From 1e64fad163fa2a8454c70abe50fcf5e316f21b6b Mon Sep 17 00:00:00 2001
From: Jeremy Fincher <jemfinch@users.sourceforge.net>
Date: Fri, 3 Oct 2003 10:04:40 +0000
Subject: [PATCH] Fixed replyNoCapability messages to be in private.

---
 src/callbacks.py       | 15 +++++++++------
 test/test_callbacks.py |  9 +++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/callbacks.py b/src/callbacks.py
index 9e10d95c9..9805d13d5 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -337,7 +337,8 @@ class IrcObjectProxy:
                     #debug.printf('Being prevented with anticap')
                     debug.msg('Preventing %s from calling %s' % \
                               (self.msg.nick, name), 'normal')
-                    self.error(self.msg, conf.replyNoCapability % name)
+                    s = conf.replyNoCapability % name
+                    self.error(self.msg, s, private=True)
                     return
                 recipient = self.msg.args[0]
                 if ircutils.isChannel(recipient):
@@ -347,7 +348,8 @@ class IrcObjectProxy:
                         #debug.printf('Being prevented with chancap')
                         debug.msg('Preventing %s from calling %s' % \
                                   (self.msg.nick, name), 'normal')
-                        self.error(self.msg, conf.replyNoCapability % name)
+                        s = conf.replyNoCapability % name
+                        self.error(self.msg, s, private=True)
                         return
                 command = getattr(cb, name)
                 if cb.threaded:
@@ -507,10 +509,10 @@ class ConfigIrcProxy(object):
     def __init__(self, irc):
         self.__dict__['irc'] = irc
         
-    def reply(self, msg, s):
+    def reply(self, msg, s, *args):
         return None
 
-    def error(self, msg, s):
+    def error(self, msg, s, *args):
         debug.msg('ConfigIrcProxy saw an error: %s' % s, 'normal')
 
     findCallback = IrcObjectProxy.findCallback.im_func
@@ -621,8 +623,9 @@ class IrcObjectProxyRegexp:
     def __init__(self, irc, *args):
         self.irc = irc
 
-    def error(self, msg, s):
-        self.reply(msg, 'Error: ' + s)
+    def error(self, msg, s, private=False):
+        private = private or conf.errorReplyPrivate
+        self.reply(msg, 'Error: ' + s, private=private)
 
     def reply(self, msg, s, prefixName=True, action=False, private=False,):
         if action:
diff --git a/test/test_callbacks.py b/test/test_callbacks.py
index 1a93a3956..e9e66e876 100644
--- a/test/test_callbacks.py
+++ b/test/test_callbacks.py
@@ -167,6 +167,15 @@ class PrivmsgTestCase(ChannelPluginTestCase):
         self.assertResponse("eval irc.reply(msg, 'foo', action=True)",
                             '\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):
         try:
             originalConfErrorReplyPrivate = conf.errorReplyPrivate