From 7bf740db35af14fb99c78c80458b883300d63563 Mon Sep 17 00:00:00 2001 From: Jeremy Fincher Date: Sat, 17 Jul 2004 06:07:45 +0000 Subject: [PATCH] Don't reveal the channel unless the nick command is given in it. --- src/Admin.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Admin.py b/src/Admin.py index f045e69a9..a177c2c7d 100755 --- a/src/Admin.py +++ b/src/Admin.py @@ -217,7 +217,13 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): irc = self.pendingNickChanges.get(irc, None) if irc is not None: channel = msg.args[-1].strip().split()[-1][1:-1] - irc.error('I can\'t change nicks, %s is +m and I\'m -v.' % channel) + assert hasattr(irc, 'msg') + if ircutils.strEqual(irc.msg.args[0], channel): + irc.error('I can\'t change nicks, ' + '%s is +m and I\'m -v.' % channel) + else: + irc.error('I can\'t change nicks, ' + 'a channel is +m and I\'m -v in it.') else: self.log.debug('Got 438 without Admin.nick being called.')