3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-22 20:09:41 +01:00

Fix privmsg.

This commit is contained in:
Jeremy Latt 2012-12-11 23:34:41 -08:00
parent 32bee68407
commit 26ef45290a
2 changed files with 7 additions and 10 deletions

View File

@ -334,21 +334,18 @@ func (m *PrivMsgMessage) TargetIsChannel() bool {
func (m *PrivMsgMessage) Handle(s *Server, c *Client) { func (m *PrivMsgMessage) Handle(s *Server, c *Client) {
if m.TargetIsChannel() { if m.TargetIsChannel() {
channel := s.channels[m.target] if channel := s.channels[m.target]; channel != nil {
if channel != nil {
channel.PrivMsg(c, m.message) channel.PrivMsg(c, m.message)
return
}
} else { } else {
if client := s.nicks[m.target]; client != nil {
client.send <- RplPrivMsg(c, m.message)
return
}
}
c.send <- ErrNoSuchNick(s, m.target) c.send <- ErrNoSuchNick(s, m.target)
} }
} else {
client := s.nicks[m.target]
if client != nil {
client.send <- RplPrivMsg(client, m.message)
} else {
c.send <- ErrNoSuchNick(s, m.target)
}
}
}
// TOPIC [newtopic] // TOPIC [newtopic]

View File

@ -102,7 +102,7 @@ func (s *Server) ChangeNick(c *Client, newNick string) {
if c.nick != "" { if c.nick != "" {
delete(s.nicks, c.nick) delete(s.nicks, c.nick)
} }
s.nicks[c.nick] = c s.nicks[newNick] = c
s.SendToInterestedClients(c, RplNick(c, newNick)) s.SendToInterestedClients(c, RplNick(c, newNick))