X-Git-Url: http://www.git.cypherpunks.ru/?p=goircd.git;a=blobdiff_plain;f=daemon.go;h=a5b2d77dcd822d257132fe045cee53473bf89757;hp=7263db7f93d30fb2e938fe3de3a56d286de37825;hb=59a6cddf54c13b63990d2c1bdc708d6b9ddb5b5f;hpb=b2f90fb412218973608b24a32eebadc60de9878a

diff --git a/daemon.go b/daemon.go
index 7263db7..a5b2d77 100644
--- a/daemon.go
+++ b/daemon.go
@@ -35,6 +35,10 @@ const (
 	ALIVENESS_CHECK = time.Second * 10  // Client's aliveness check period
 )
 
+var (
+	RE_NICKNAME = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
+)
+
 type Daemon struct {
 	hostname             string
 	motd                 string
@@ -63,7 +67,7 @@ func (daemon *Daemon) SendLusers(client *Client) {
 			lusers++
 		}
 	}
-	client.ReplyNicknamed("251", fmt.Sprintf("There are %d users and 0 services on 1 server", lusers))
+	client.ReplyNicknamed("251", fmt.Sprintf("There are %d users and 0 invisible on 1 servers", lusers))
 }
 
 func (daemon *Daemon) SendMotd(client *Client) {
@@ -80,7 +84,7 @@ func (daemon *Daemon) SendMotd(client *Client) {
 			}
 
 			client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
-			for _, s := range bytes.Split(motd, []byte("\n")) {
+			for _, s := range bytes.Split(bytes.TrimRight(motd, "\n"), []byte("\n")) {
 				client.ReplyNicknamed("372", "- "+string(s))
 			}
 			client.ReplyNicknamed("376", "End of /MOTD command")
@@ -113,10 +117,10 @@ func (daemon *Daemon) SendWhois(client *Client, nicknames []string) {
 			}
 			sort.Strings(subscriptions)
 			client.ReplyNicknamed("319", c.nickname, strings.Join(subscriptions, " "))
-			client.ReplyNicknamed("318", c.nickname, "End of WHOIS list")
+			client.ReplyNicknamed("318", c.nickname, "End of /WHOIS list")
 		}
 		if !found {
-			client.ReplyNicknamed("401", nickname, "No such nickname")
+			client.ReplyNoNickChan(nickname)
 		}
 	}
 }
@@ -138,7 +142,7 @@ func (daemon *Daemon) SendList(client *Client, cols []string) {
 			client.ReplyNicknamed("322", room, fmt.Sprintf("%d", len(r.members)), r.topic)
 		}
 	}
-	client.ReplyNicknamed("323", "End of LIST")
+	client.ReplyNicknamed("323", "End of /LIST")
 }
 
 // Unregistered client workflow processor. Unregistered client:
@@ -153,19 +157,16 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
 			client.ReplyParts("431", "No nickname given")
 			return
 		}
-		nickname := strings.ToLower(cols[1])
-		nickname_found := false
+		nickname := cols[1]
 		for client := range daemon.clients {
 			if client.nickname == nickname {
-				nickname_found = true
+				client.ReplyParts("433", "*", nickname, "Nickname is already in use")
+				return
 			}
 		}
-		if nickname_found {
-			client.ReplyParts("433", "*", cols[1], "Nickname is already in use")
-			return
-		}
-		if ok, _ := regexp.MatchString("^[^_-][_a-z0-9-]{1,50}$", nickname); !ok {
+		if !RE_NICKNAME.MatchString(nickname) {
 			client.ReplyParts("432", "*", cols[1], "Erroneous nickname")
+			return
 		}
 		client.nickname = nickname
 	case "USER":
@@ -213,8 +214,7 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 		keys = []string{}
 	}
 	for n, room := range rooms {
-		room, valid := RoomNameSanitize(room)
-		if !valid {
+		if !RoomNameValid(room) {
 			client.ReplyNoChannel(room)
 			continue
 		}
@@ -239,7 +239,6 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 		}
 		if denied {
 			client.ReplyNicknamed("475", room, "Cannot join channel (+k) - bad key")
-			continue
 		}
 		if denied || joined {
 			continue
@@ -247,6 +246,7 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 		room_new, room_sink := daemon.RoomRegister(room)
 		if key != "" {
 			room_new.key = key
+			room_new.StateSave()
 		}
 		room_sink <- ClientEvent{client, EVENT_NEW, ""}
 	}
@@ -326,7 +326,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 					}
 					continue
 				}
-				room, _ := RoomNameSanitize(cols[0])
+				room := cols[0]
 				r, found := daemon.rooms[room]
 				if !found {
 					client.ReplyNoChannel(room)
@@ -345,10 +345,10 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 					continue
 				}
 				for _, room := range strings.Split(cols[1], ",") {
-					room, _ = RoomNameSanitize(room)
 					r, found := daemon.rooms[room]
 					if !found {
 						client.ReplyNoChannel(room)
+						continue
 					}
 					daemon.room_sinks[r] <- ClientEvent{client, EVENT_DEL, ""}
 				}
@@ -362,7 +362,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 				continue
 			case "NOTICE", "PRIVMSG":
 				if len(cols) == 1 {
-					client.ReplyNicknamed("411", "No recipient given")
+					client.ReplyNicknamed("411", "No recipient given ("+command+")")
 					continue
 				}
 				cols = strings.SplitN(cols[1], " ", 2)
@@ -382,10 +382,9 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 				if msg != "" {
 					continue
 				}
-				target, _ = RoomNameSanitize(target)
 				r, found := daemon.rooms[target]
 				if !found {
-					client.ReplyNicknamed("401", target, "No such nickname/channel")
+					client.ReplyNoNickChan(target)
 				}
 				daemon.room_sinks[r] <- ClientEvent{client, EVENT_MSG, command + " " + strings.TrimLeft(cols[1], ":")}
 			case "TOPIC":
@@ -394,10 +393,10 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 					continue
 				}
 				cols = strings.SplitN(cols[1], " ", 2)
-				room, _ := RoomNameSanitize(cols[0])
-				r, found := daemon.rooms[room]
+				r, found := daemon.rooms[cols[0]]
 				if !found {
-					client.ReplyNoChannel(room)
+					client.ReplyNoChannel(cols[0])
+					continue
 				}
 				var change string
 				if len(cols) > 1 {
@@ -411,10 +410,11 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
 					client.ReplyNotEnoughParameters("WHO")
 					continue
 				}
-				room, _ := RoomNameSanitize(strings.Split(cols[1], " ")[0])
+				room := strings.Split(cols[1], " ")[0]
 				r, found := daemon.rooms[room]
 				if !found {
 					client.ReplyNoChannel(room)
+					continue
 				}
 				daemon.room_sinks[r] <- ClientEvent{client, EVENT_WHO, ""}
 			case "WHOIS":