validation: consider +, - and ' as a valid separators for character name words (#306)

* validation: consider + as a valid separator for character name words
* validation: consider + and ' as well

Author: phenpessoa

src/validation/tibia.go

@@ -3,6 +3,7 @@ package validation
 import (
 	"regexp"
 	"strings"
+	"unicode"
 	"unicode/utf8"
 )
 
@@ -65,7 +66,7 @@ func IsCharacterNameValid(name string) error {
 	}
 
 	// Check if any word in the name has a length > 14
-	strs := strings.Fields(name)
+	strs := strings.FieldsFunc(name, isValidCharacterNameSeparator)
 	for _, str := range strs {
 		if utf8.RuneCountInString(str) > MaxRunesAllowedInACharacterNameWord {
 			return ErrorCharacterWordTooBig
@@ -85,6 +86,14 @@ func IsCharacterNameValid(name string) error {
 	return nil
 }
 
+func isValidCharacterNameSeparator(r rune) bool {
+	switch r {
+	case '+', '-', '\'':
+		return true
+	}
+	return unicode.IsSpace(r)
+}
+
 // IsGuildNameValid reports wheter the provided string represents a valid guild name
 // Check if error == nil to see whether the name is valid or not
 func IsGuildNameValid(name string) error {

src/validation/validation_test.go

@@ -47,6 +47,12 @@ func TestNameValidator(t *testing.T) {
 		"Näurin", "Hälge",
 		"Li-Ho Crue",
 		"Obi-Bok",
+		"Jamil Ondeta Temconfusao",
+		"Traicionaron Al Mikee",
+		"Jamil+Ondeta+Temconfusao",
+		"Traicionaron+Al+Mikee",
+		"Antorchita'cachibengala",
+		"Leonardinha-princesinha",
 	}
 
 	for _, n := range names {
@@ -62,6 +68,7 @@ func TestNameValidator(t *testing.T) {
 		"A",
 		"a",
 		"T2wo",
+		"JamilOndetaTemconfusao",
 	}
 
 	for _, n := range invalidNames {
@@ -75,7 +82,7 @@ func TestNameValidator(t *testing.T) {
 		ErrorCharacterNameEmpty:            "",
 		ErrorCharacterNameTooSmall:         "o",
 		ErrorCharacterNameTooBig:           "abcabcabcabcabcabcabcabcabcabc",
-		ErrorCharacterWordTooBig:           "abcabcabcabcabcab hello",
+		ErrorCharacterWordTooBig:           "JamilOndetaTemconfusao hello",
 		ErrorCharacterNameIsOnlyWhiteSpace: "     ",
 		ErrorCharacterNameInvalid:          "12",
 	}