fixed a matching rule

diff --git a/package.json b/package.json
index e86486338fe775b57b7c9642955b0d4f74f26d55..c98d4d09e10052c1f1afa6bba65b5f2e3e9da804 100644 (file)
--- a/package.json
+++ b/package.json
@@ -12,5 +12,5 @@
   "engines": {
     "node": "0.6.x"
   },
-  "version": "0.1.1-14"
+  "version": "0.1.1-17"
 }
\ No newline at end of file

diff --git a/server.js b/server.js
index d72589dec79ca8b5e5e6a3af6f20362623678f38..e2e835c9fcb31dbc648907e85049af2f57537e61 100644 (file)
--- a/server.js
+++ b/server.js
@@ -84,7 +84,10 @@ var Game = {
        // A user is submitting a name
        setNickName: function(socket, nickname) {
            var feedback = null;
-               if (nickname === "Binb") {
+               if (nickname.length > 18) {
+                       feedback = '<span class="label label-important">That name is too long.</span>';
+               }
+               else if (nickname === "Binb") {
                        feedback = '<span class="label label-important">That name is reserved.</span>';
                }
                else if (Game.userExists(nickname)) {
@@ -226,10 +229,6 @@ var Game = {
                        Game.checkDistance(subject.replace(/\./g, ""), guess, config.threshold)) {
                        return true;
                }
-               if (!enableartistrules && subject.match(/,/) && 
-                       Game.checkDistance(subject.replace(/,/g, ""), guess, config.threshold)) {
-                       return true;
-               }
                if (subject.match(/\-/) && 
                        Game.checkDistance(subject.replace(/\-/g, ""), guess, config.threshold)) {
                        return true;
@@ -253,10 +252,18 @@ var Game = {
                                }
                        }
                }
-               splitted = subject.split("(");
-               if (splitted.length !== 1) {
-                       trimmed = splitted[0].replace(/ +$/, "");
-                       if (Game.checkDistance(trimmed, guess, config.threshold)) {
+               else {
+                       if (subject.match(/,/) && 
+                               Game.checkDistance(subject.replace(/,/g, ""), guess, config.threshold)) {
+                               return true;
+                       }
+                       if (subject.match(/\(.+\)\??(?: \[.+\])?/) && Game.checkDistance(
+                               subject.replace(/\(.+\)\??(?: \[.+\])?/, "").replace(/^ +/, "").replace(/ +$/, ""), 
+                               guess, config.threshold)) {
+                               return true;
+                       }
+                       if (subject.match(/, [pP]t\. [0-9]$/) && 
+                               Game.checkDistance(subject.replace(/, [pP]t\. [0-9]$/, ""), guess, config.threshold)) {
                                return true;
                        }
                }