Merge pull request #654 from slingamn/issue652

fix #652
This commit is contained in:
Shivaram Lingamneni 2019-10-23 20:56:16 -07:00 committed by GitHub
commit 9495362785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions

View File

@ -2660,20 +2660,21 @@ func webircHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Re
// WHO [<mask> [o]] // WHO [<mask> [o]]
func whoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool { func whoHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *ResponseBuffer) bool {
if msg.Params[0] == "" { mask := msg.Params[0]
var err error
if mask == "" {
rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.nick, "WHO", client.t("First param must be a mask or channel")) rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.nick, "WHO", client.t("First param must be a mask or channel"))
return false return false
} else if mask[0] == '#' {
mask, err = CasefoldChannel(msg.Params[0])
} else {
mask, err = Casefold(mask)
} }
var mask string
if len(msg.Params) > 0 {
casefoldedMask, err := Casefold(msg.Params[0])
if err != nil { if err != nil {
rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), "WHO", client.t("Mask isn't valid")) rb.Add(nil, server.name, ERR_UNKNOWNERROR, client.Nick(), "WHO", client.t("Mask isn't valid"))
return false return false
} }
mask = casefoldedMask
}
//TODO(dan): is this used and would I put this param in the Modern doc? //TODO(dan): is this used and would I put this param in the Modern doc?
// if not, can we remove it? // if not, can we remove it?