Parse PRIVMSGs sent from nicks containing an underscore

phergie · Feb 5, 2013 · a1d2359 · a1d2359
1 parent 8658c0a
commit a1d2359
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Phergie/Irc/Parser.php b/src/Phergie/Irc/Parser.php
@@ -206,7 +206,7 @@ public function __construct()
         $params = "(?P<params>$trailing?|(?:$middle{0,14}$trailing)|(?:$middle{0,15}))";
         $name = "[$letter](?:[$letter$number\\-]*[$letter$number])?";
         $host = "$name(?:\\.$name)+";
-        $nick = "(?:[$letter][$letter$number\\-\\[\\]\\\\`^{}]*)";
+        $nick = "(?:[$letter][$letter$number\\-\\[\\]\\\\`^{}\\_]*)";
         $user = "(?:[^ $null$crlf]+)";
         $prefix = "(?:(?P<servername>$host)|(?P<nick>$nick)(?:!(?P<user>$user))?(?:@$host)?)";
         $message = "(?P<prefix>:$prefix )?$command$params$crlf";

diff --git a/tests/Phergie/Irc/ParserTest.php b/tests/Phergie/Irc/ParserTest.php
@@ -151,6 +151,18 @@ public function dataProviderTestParse()
                     'targets' => array('Wiz'),
                 ),
             ),
+
+            array(
+                "NICK :Wiz_\r\n",
+                array(
+                    'command' => 'NICK',
+                    'params' => array(
+                        'nickname' => 'Wiz_',
+                        'all' => 'Wiz_',
+                    ),
+                    'targets' => array('Wiz_'),
+                ),
+            ),
 
             array(
                 "NICK Wiz :1\r\n",
@@ -2161,6 +2173,7 @@ public function dataProviderTestParse()
                 ),
             ),
 
+            // ACTION (CTCP Specification)
             array(
                 ":john!~jsmith@example.com PRIVMSG #test :\001ACTION test\001\r\n",
                 array(