Do not prepend unnecessary ':' to person-to-person PRIVMSGs

diff --git a/daemon.go b/daemon.go
index d8cc3b8bc2729d87af875dc7ea30ffd06b389c7b..30d458bd83a10b3a19c716a3081e8e88edb250b9 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -377,7 +377,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                target := strings.ToLower(cols[0])
                                for c := range daemon.clients {
                                        if c.nickname == target {
                                target := strings.ToLower(cols[0])
                                for c := range daemon.clients {
                                        if c.nickname == target {

-                                               msg = fmt.Sprintf(":%s %s %s :%s", client, command, c.nickname, cols[1])
+                                               msg = fmt.Sprintf(":%s %s %s %s", client, command, c.nickname, cols[1])

                                                c.Msg(msg)
                                                break
                                        }
                                                c.Msg(msg)
                                                break
                                        }

diff --git a/room_test.go b/room_test.go
index 11778fb67d835f505a286c02ada13c5f7567a00a..35c699a7d8a9d01325bdfa2b80d6429f35a0fb69 100644 (file)
--- a/room_test.go
+++ b/room_test.go
@@ -83,7 +83,7 @@ func TestTwoUsers(t *testing.T) {
                <-conn1.outbound
                <-conn2.outbound
        }
                <-conn1.outbound
                <-conn2.outbound
        }

-       conn1.inbound <- "PRIVMSG nick2 Hello"
+       conn1.inbound <- "PRIVMSG nick2 :Hello"

        conn1.inbound <- "PRIVMSG #foo :world"
        conn1.inbound <- "NOTICE #foo :world"
        if r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG nick2 :Hello\r\n" {
        conn1.inbound <- "PRIVMSG #foo :world"
        conn1.inbound <- "NOTICE #foo :world"
        if r := <-conn2.outbound; r != ":nick1!foo1@someclient PRIVMSG nick2 :Hello\r\n" {