瀏覽代碼

Merge pull request #1915 from slingamn/privileged_kick

fix #1906
tags/v2.10.0-rc1
Shivaram Lingamneni 2 年之前
父節點
當前提交
59ef59870a
No account linked to committer's email address
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 1
    2
      irc/handlers.go
  2. 1
    1
      irctest

+ 1
- 2
irc/handlers.go 查看文件

@@ -1340,7 +1340,6 @@ func sajoinHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respo
1340 1340
 // the number of users.
1341 1341
 // Addditionally, we support multiple channels and a single user.
1342 1342
 func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *ResponseBuffer) bool {
1343
-	hasPrivs := client.HasRoleCapabs("samode")
1344 1343
 	channels := strings.Split(msg.Params[0], ",")
1345 1344
 	users := strings.Split(msg.Params[1], ",")
1346 1345
 	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
1398 1397
 			rb.Add(nil, server.name, ERR_NOSUCHNICK, client.nick, utils.SafeErrorParam(kick.nick), client.t("No such nick"))
1399 1398
 			continue
1400 1399
 		}
1401
-		channel.Kick(client, target, comment, rb, hasPrivs)
1400
+		channel.Kick(client, target, comment, rb, false)
1402 1401
 	}
1403 1402
 	return false
1404 1403
 }

+ 1
- 1
irctest

@@ -1 +1 @@
1
-Subproject commit 88a8f8ad8dfa4bec80d419271f65bb6901d98def
1
+Subproject commit 6b1084faced6cb3875af34db74c0e4c092e09319

Loading…
取消
儲存