From: Luigi Pinca <luigipinca@gmail.com>
Date: Fri, 16 Mar 2012 16:38:32 +0000 (+0100)
Subject: fixed a matching rule
X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=b645a32b0ec957574765bd03eddd4cfdbe10cf42;p=binbsis50.git

fixed a matching rule
---

diff --git a/package.json b/package.json
index e864863..c98d4d0 100644
--- 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 d72589d..e2e835c 100644
--- 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;
 			}
 		}