GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-12-22 18:52:41 +01:00
Code Issues Projects Releases Wiki Activity

fix bad ERR_WASNOSUCHNICK responses

Browse Source
This commit is contained in:
Shivaram Lingamneni 2019-12-05 07:52:58 -05:00
parent bcc58be8af
commit 438d1f0488
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
irc/handlers.go
View File

@ -2773,9 +2773,12 @@ func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
nicknames := strings.Split(msg.Params[0], ",") nicknames := strings.Split(msg.Params[0], ",")
// 0 means "all the entries", as does a negative number // 0 means "all the entries", as does a negative number
var count uint64 var count int
if len(msg.Params) > 1 { if len(msg.Params) > 1 {
count, _ = strconv.ParseUint(msg.Params[1], 10, 64) count, _ = strconv.Atoi(msg.Params[1])
if count < 0 {
count = 0
}
} }
//var target string //var target string
//if len(msg.Params) > 2 { //if len(msg.Params) > 2 {
@ -2783,19 +2786,18 @@ func whowasHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
//} //}
cnick := client.Nick() cnick := client.Nick()
for _, nickname := range nicknames { for _, nickname := range nicknames {
results := server.whoWas.Find(nickname, int(count)) if len(nickname) == 0 {
if len(results) == 0 { continue
if len(nickname) > 0 {
rb.Add(nil, server.name, ERR_WASNOSUCHNICK, cnick, nickname, client.t("There was no such nickname"))
} }
results := server.whoWas.Find(nickname, count)
if len(results) == 0 {
rb.Add(nil, server.name, ERR_WASNOSUCHNICK, cnick, utils.SafeErrorParam(nickname), client.t("There was no such nickname"))
} else { } else {
for _, whoWas := range results { for _, whoWas := range results {
rb.Add(nil, server.name, RPL_WHOWASUSER, cnick, whoWas.nick, whoWas.username, whoWas.hostname, "*", whoWas.realname) rb.Add(nil, server.name, RPL_WHOWASUSER, cnick, whoWas.nick, whoWas.username, whoWas.hostname, "*", whoWas.realname)
} }
} }
if len(nickname) > 0 { rb.Add(nil, server.name, RPL_ENDOFWHOWAS, cnick, utils.SafeErrorParam(nickname), client.t("End of WHOWAS"))
rb.Add(nil, server.name, RPL_ENDOFWHOWAS, cnick, nickname, client.t("End of WHOWAS"))
}
} }
return false return false
} }