From b7ed55d45c0031d57d64b3b199d5c183bc243526 Mon Sep 17 00:00:00 2001
From: Jeremy Latt <jeremy.latt@gmail.com>
Date: Wed, 12 Dec 2012 23:33:09 -0800
Subject: [PATCH] Fix privmsg.

---
 src/irc/commands.go |  2 +-
 src/irc/reply.go    | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/irc/commands.go b/src/irc/commands.go
index b1340a6b..7cf48800 100644
--- a/src/irc/commands.go
+++ b/src/irc/commands.go
@@ -383,7 +383,7 @@ func (m *PrivMsgMessage) Handle(s *Server, c *Client) {
 		}
 	} else {
 		if client := s.nicks[m.target]; client != nil {
-			client.send <- RplPrivMsg(c, m.message)
+			client.send <- RplPrivMsg(c, client, m.message)
 			return
 		}
 	}
diff --git a/src/irc/reply.go b/src/irc/reply.go
index 786d0bbe..04dc71f2 100644
--- a/src/irc/reply.go
+++ b/src/irc/reply.go
@@ -42,10 +42,10 @@ func (reply *NumericReply) String(client *Client) string {
 		reply.message)
 }
 
-// messaging
+// messaging replies
 
-func RplPrivMsg(source *Client, message string) Reply {
-	return NewNumericReply(source, RPL_PRIVMSG, ":"+message)
+func RplPrivMsg(source *Client, target *Client, message string) Reply {
+	return NewBasicReply(source, RPL_PRIVMSG, fmt.Sprintf("%s :%s", target, message))
 }
 
 func RplNick(client *Client, newNick string) Reply {
@@ -72,7 +72,11 @@ func RplQuit(client *Client, message string) Reply {
 	return NewBasicReply(client, RPL_QUIT, ":"+message)
 }
 
-// Server Info
+func RplInviteMsg(channel *Channel, inviter *Client) Reply {
+	return NewBasicReply(inviter, RPL_INVITE, channel.name)
+}
+
+// numeric replies
 
 func RplWelcome(source Identifier, client *Client) Reply {
 	return NewNumericReply(source, RPL_WELCOME,
@@ -98,8 +102,6 @@ func RplUModeIs(server *Server, client *Client) Reply {
 	return NewNumericReply(server, RPL_UMODEIS, client.UModeString())
 }
 
-// numeric replies
-
 func RplNoTopic(channel *Channel) Reply {
 	return NewNumericReply(channel.server, RPL_NOTOPIC, channel.name+" :No topic is set")
 }
@@ -108,10 +110,6 @@ func RplTopic(channel *Channel) Reply {
 	return NewNumericReply(channel.server, RPL_TOPIC, fmt.Sprintf("%s :%s", channel.name, channel.topic))
 }
 
-func RplInviteMsg(channel *Channel, inviter *Client) Reply {
-	return NewNumericReply(inviter, RPL_INVITE, channel.name)
-}
-
 func RplInvitingMsg(channel *Channel, invitee *Client) Reply {
 	return NewNumericReply(channel.server, RPL_INVITING,
 		fmt.Sprintf("%s %s", channel.name, invitee.Nick()))
@@ -131,7 +129,7 @@ func RplYoureOper(server *Server) Reply {
 	return NewNumericReply(server, RPL_YOUREOPER, ":You are now an IRC operator")
 }
 
-// errors
+// errors (also numeric)
 
 func ErrAlreadyRegistered(source Identifier) Reply {
 	return NewNumericReply(source, ERR_ALREADYREGISTRED, ":You may not reregister")