Less strict IRC parsing to allow non-latin characters #376 #202

diff --git a/server/irc/connection.js b/server/irc/connection.js
index c807c21d8da6ebd3f5de74f66486ecf4bede3fda..06d4e2f30b75cc323a340fce34724c8497034e9c 100644 (file)
--- a/server/irc/connection.js
+++ b/server/irc/connection.js
@@ -713,7 +713,7 @@ function socketOnData(data) {
  * Deviates from the RFC a little to support the '/' character now used in some
  * IRCds
  */
-var parse_regex = /^(?:(?:(?:@([^ ]+) )?):(?:([a-z0-9\x5B-\x60\x7B-\x7D\.\-*]+)|([a-z0-9\x5B-\x60\x7B-\x7D\.\-*]+)!([^\x00\r\n\ ]+?)@?([a-z0-9\.\-:\/_]+)?) )?(\S+)(?: (?!:)(.+?))?(?: :(.*))?$/i;
+var parse_regex = /^(?:(?:(?:@([^ ]+) )?):(?:([^\s!]+)|([^\s!]+)!([^\s@]+)@?([^\s]+)?) )?(\S+)(?: (?!:)(.+?))?(?: :(.*))?$/i;
 
 function parseIrcLine(buffer_line) {
     var msg,