X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=room.go;h=f92d0e6b08811f89758111420da09ba80204416c;hp=9e1900206c71bc6be54af15526458798d6deb199;hb=043730c35562365191764faf321424eb7bec0513;hpb=1331f317fba7c877c196b67eca6434d763b35d02

diff --git a/room.go b/room.go
index 9e19002..f92d0e6 100644
--- a/room.go
+++ b/room.go
@@ -25,12 +25,14 @@ import (
 	"strings"
 )
 
+var (
+	RE_ROOM = regexp.MustCompile("^#[^\x00\x07\x0a\x0d ,:/]{1,200}$")
+)
+
 // Sanitize room's name. It can consist of 1 to 50 ASCII symbols
 // with some exclusions. All room names will have "#" prefix.
-func RoomNameSanitize(name string) (n string, valid bool) {
-	n = strings.TrimLeft(strings.ToLower(name), "&#+!")
-	valid, _ = regexp.MatchString("^[^\x00\x07\x0a\x0d ,:/]{1,50}$", n)
-	return "#" + n, valid
+func RoomNameValid(name string) bool {
+	return RE_ROOM.MatchString(name)
 }
 
 type Room struct {