mirror of
https://github.com/ergochat/ergo.git
synced 2024-12-23 11:12:44 +01:00
Merge pull request #1776 from ProgVal/kick-default-comment
Make kick messages default to the kicker name instead of the kicked
This commit is contained in:
commit
0d438dd0d6
@ -1373,6 +1373,9 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
|
||||
if len(msg.Params) > 2 {
|
||||
comment = msg.Params[2]
|
||||
}
|
||||
if comment == "" {
|
||||
comment = client.Nick()
|
||||
}
|
||||
for _, kick := range kicks {
|
||||
channel := server.channels.Get(kick.channel)
|
||||
if channel == nil {
|
||||
@ -1385,10 +1388,6 @@ 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
|
||||
}
|
||||
|
||||
if comment == "" {
|
||||
comment = kick.nick
|
||||
}
|
||||
channel.Kick(client, target, comment, rb, hasPrivs)
|
||||
}
|
||||
return false
|
||||
|
Loading…
Reference in New Issue
Block a user