Fix an edge case where we use the wrong arg in NICK to change the currentnick.

belak · belak · commit 0b06bbe5ed8a · 2014-11-06T14:51:19.000-08:00
diff --git a/client.go b/client.go
@@ -197,8 +197,8 @@ func (c *Client) readLoop() error {
 				fmt.Printf("!!! Lag: %v\n", delta)
 			}
 		} else if e.Command == "NICK" {
-			if e.Identity.Nick == c.currentNick {
-				c.currentNick = lastArg
+			if e.Identity.Nick == c.currentNick && len(e.Args) > 0 {
+				c.currentNick = e.Args[0]
 			}
 		} else if e.Command == "001" {
 			c.currentNick = e.Args[0]

Original file line number	Diff line number	Diff line change
`@@ -197,8 +197,8 @@ func (c *Client) readLoop() error {`
`197`	`197`	`fmt.Printf("!!! Lag: %v\n", delta)`
`198`	`198`	`}`
`199`	`199`	`} else if e.Command == "NICK" {`
`200`		`- if e.Identity.Nick == c.currentNick {`
`201`		`- c.currentNick = lastArg`
	`200`	`+ if e.Identity.Nick == c.currentNick && len(e.Args) > 0 {`
	`201`	`+ c.currentNick = e.Args[0]`
`202`	`202`	`}`
`203`	`203`	`} else if e.Command == "001" {`
`204`	`204`	`c.currentNick = e.Args[0]`