diff --git a/irc/handlers.go b/irc/handlers.go index cf51b2b0..c361ba77 100644 --- a/irc/handlers.go +++ b/irc/handlers.go @@ -1340,7 +1340,6 @@ func sajoinHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respo // the number of users. // Addditionally, we support multiple channels and a single user. func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *ResponseBuffer) bool { - hasPrivs := client.HasRoleCapabs("samode") channels := strings.Split(msg.Params[0], ",") users := strings.Split(msg.Params[1], ",") if (len(channels) != len(users)) && (len(users) != 1) && (len(channels) != 1) { @@ -1398,7 +1397,7 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons rb.Add(nil, server.name, ERR_NOSUCHNICK, client.nick, utils.SafeErrorParam(kick.nick), client.t("No such nick")) continue } - channel.Kick(client, target, comment, rb, hasPrivs) + channel.Kick(client, target, comment, rb, false) } return false } diff --git a/irctest b/irctest index 88a8f8ad..6b1084fa 160000 --- a/irctest +++ b/irctest @@ -1 +1 @@ -Subproject commit 88a8f8ad8dfa4bec80d419271f65bb6901d98def +Subproject commit 6b1084faced6cb3875af34db74c0e4c092e09319