Merge pull request #60 from go-irc/nick-collision-startup

Only handle nick collisions during the handshake

client.go

@@ -14,12 +14,23 @@ import (
 var clientFilters = map[string]func(*Client, *Message){
 	"001": func(c *Client, m *Message) {
 		c.currentNick = m.Params[0]
+		c.connected = true
 	},
 	"433": func(c *Client, m *Message) {
+		// We only want to try and handle nick collisions during the initial
+		// handshake.
+		if c.connected {
+			return
+		}
 		c.currentNick = c.currentNick + "_"
 		c.Writef("NICK :%s", c.currentNick)
 	},
 	"437": func(c *Client, m *Message) {
+		// We only want to try and handle nick collisions during the initial
+		// handshake.
+		if c.connected {
+			return
+		}
 		c.currentNick = c.currentNick + "_"
 		c.Writef("NICK :%s", c.currentNick)
 	},
@@ -87,6 +98,7 @@ type Client struct {
 	limiter          chan struct{}
 	incomingPongChan chan string
 	errChan          chan error
+	connected        bool
 }
 
 // NewClient creates a client given an io stream and a client config.

client_test.go

@@ -84,6 +84,28 @@ func TestClient(t *testing.T) {
 		SendLine("437\r\n"),
 		ExpectLine("NICK :test_nick_\r\n"),
 	})
+
+	assert.Equal(t, "test_nick_", c.CurrentNick())
+	c = runClientTest(t, config, io.EOF, []TestAction{
+		ExpectLine("PASS :test_pass\r\n"),
+		ExpectLine("NICK :test_nick\r\n"),
+		ExpectLine("USER test_user 0.0.0.0 0.0.0.0 :test_name\r\n"),
+		SendLine("433\r\n"),
+		ExpectLine("NICK :test_nick_\r\n"),
+		SendLine("001 :test_nick_\r\n"),
+		SendLine("433\r\n"),
+	})
+	assert.Equal(t, "test_nick_", c.CurrentNick())
+
+	c = runClientTest(t, config, io.EOF, []TestAction{
+		ExpectLine("PASS :test_pass\r\n"),
+		ExpectLine("NICK :test_nick\r\n"),
+		ExpectLine("USER test_user 0.0.0.0 0.0.0.0 :test_name\r\n"),
+		SendLine("437\r\n"),
+		ExpectLine("NICK :test_nick_\r\n"),
+		SendLine("001 :test_nick_\r\n"),
+		SendLine("437\r\n"),
+	})
 	assert.Equal(t, "test_nick_", c.CurrentNick())
 }