X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=500e80b61584ca0cb7054275851f63c4dd6936b4;hb=3564207ae93f4b9cd19d504c2bff2372a88e14cc;hp=53dde3eedbe93282cabefda26fcbde482b61f10d;hpb=3016635f6a6bd23e34461e93cef3e8d861ce4275;p=goircd.git

diff --git a/daemon.go b/daemon.go
index 53dde3e..500e80b 100644
--- a/daemon.go
+++ b/daemon.go
@@ -48,7 +48,7 @@ type Daemon struct {
 	hostname           *string
 	motd               *string
 	passwords          *string
-	clients            map[*Client]bool
+	clients            map[*Client]struct{}
 	clientAliveness    map[*Client]*ClientAlivenessState
 	rooms              map[string]*Room
 	roomSinks          map[*Room]chan ClientEvent
@@ -59,12 +59,12 @@ type Daemon struct {
 
 func NewDaemon(version string, hostname, motd, passwords *string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
 	daemon := Daemon{
-		version: version,
-		hostname: hostname,
-		motd: motd,
+		version:   version,
+		hostname:  hostname,
+		motd:      motd,
 		passwords: passwords,
 	}
-	daemon.clients = make(map[*Client]bool)
+	daemon.clients = make(map[*Client]struct{})
 	daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
 	daemon.rooms = make(map[string]*Room)
 	daemon.roomSinks = make(map[*Room]chan ClientEvent)
@@ -303,8 +303,9 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 }
 
 func (daemon *Daemon) Processor(events <-chan ClientEvent) {
+	var now time.Time
 	for event := range events {
-		now := time.Now()
+		now = time.Now()
 		client := event.client
 
 		// Check for clients aliveness
@@ -334,9 +335,9 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 
 		switch event.eventType {
 		case EventNew:
-			daemon.clients[client] = true
+			daemon.clients[client] = struct{}{}
 			daemon.clientAliveness[client] = &ClientAlivenessState{
-				pingSent: false,
+				pingSent:  false,
 				timestamp: now,
 			}
 		case EventDel:
@@ -414,7 +415,8 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 					client.ReplyNotEnoughParameters("PART")
 					continue
 				}
-				for _, room := range strings.Split(cols[1], ",") {
+				rooms := strings.Split(cols[1], " ")[0]
+				for _, room := range strings.Split(rooms, ",") {
 					r, found := daemon.rooms[room]
 					if !found {
 						client.ReplyNoChannel(room)
@@ -458,6 +460,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 				r, found := daemon.rooms[target]
 				if !found {
 					client.ReplyNoNickChan(target)
+					continue
 				}
 				daemon.roomSinks[r] <- ClientEvent{
 					client,