From 34d91284a578410b3d1b8d9389e00e1cee609c7c Mon Sep 17 00:00:00 2001
From: Daniel Folkinshteyn <nanotube@users.sourceforge.net>
Date: Sun, 11 Apr 2010 17:01:31 -0400
Subject: [PATCH] in Later nick validation, use irc.isNick. now instead of
 forcing strictRfc to true, we are using the config.

---
 plugins/Later/plugin.py | 8 ++++----
 plugins/Later/test.py   | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/Later/plugin.py b/plugins/Later/plugin.py
index bf89718b9..e718c1313 100644
--- a/plugins/Later/plugin.py
+++ b/plugins/Later/plugin.py
@@ -99,7 +99,7 @@ class Later(callbacks.Plugin):
             self.wildcards.append(nick)
         self._flushNotes()
     
-    def _validateNick(self, nick):
+    def _validateNick(self, irc, nick):
         """Validate nick according to the IRC RFC 2812 spec.
         
         Reference: http://tools.ietf.org/rfcmarkup?doc=2812#section-2.3.1
@@ -111,8 +111,8 @@ class Later(callbacks.Plugin):
         If nick incorrigibly invalid, return False, otherwise, 
         return (possibly trimmed) nick.
         """
-        if not ircutils.isNick(nick, strictRfc=True):
-            if not ircutils.isNick(nick[:-1], strictRfc=True):
+        if not irc.isNick(nick):
+            if not irc.isNick(nick[:-1]):
                 return False
             else:
                 return nick[:-1]
@@ -128,7 +128,7 @@ class Later(callbacks.Plugin):
         if ircutils.strEqual(nick, irc.nick):
             irc.error('I can\'t send notes to myself.')
             return
-        validnick = self._validateNick(nick)
+        validnick = self._validateNick(irc, nick)
         if validnick is False:
             irc.error('That is an invalid IRC nick. Please check your input.')
             return
diff --git a/plugins/Later/test.py b/plugins/Later/test.py
index d91070620..447f088fd 100644
--- a/plugins/Later/test.py
+++ b/plugins/Later/test.py
@@ -44,10 +44,13 @@ class LaterTestCase(PluginTestCase):
         self.assertRegexp('later notes', 'foo')
 
     def testNickValidation(self):
+        origconf = conf.supybot.protocols.irc.strictRfc()
+        conf.supybot.protocols.irc.strictRfc.setValue('True')
         self.assertError('later tell 1foo bar')
         self.assertError('later tell foo$moo zoob')
         self.assertNotError('later tell foo: baz')
         self.assertRegexp('later notes', 'foo\.')
+        conf.supybot.protocols.irc.strictRfc.setValue(origconf)
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: