GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 13:29:27 +01:00
Code Issues Projects Releases Wiki Activity

Restore support for multiple channels + single user

Browse Source
This commit is contained in:
Valentin Lorentz 2021-07-10 17:36:39 +02:00
parent 54c5d35193
commit f58f8531b2
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
irc/handlers.go
View File

@ -1273,7 +1273,9 @@ func sajoinHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respo
}
// KICK <channel>{,<channel>} <user>{,<user>} [<comment>]
// The number of channels must be either 1 or equal to the number of users
// RFC 2812 requires the number of channels to be either 1 or equal to
// 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], ",")
@ -1287,7 +1289,21 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
channel string
nick string
}
kicks := make([]kickCmd, 0, len(users))
var kicks []kickCmd
if len(users) == 1 {
kicks = make([]kickCmd, 0, len(channels))
// Single user, possibly multiple channels
user := users[0]
for _, channel := range channels {
if channel == "" {
continue // #679
}
kicks = append(kicks, kickCmd{channel, user})
}
} else {
// Multiple users, either a single channel or as many channels
// as users.
kicks = make([]kickCmd, 0, len(users))
channel := channels[0]
for index, user := range users {
if len(channels) > 1 {
@ -1298,6 +1314,7 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
}
kicks = append(kicks, kickCmd{channel, user})
}
}
var comment string
if len(msg.Params) > 2 {