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

Merge pull request #1776 from ProgVal/kick-default-comment

Browse Source 
Make kick messages default to the kicker name instead of the kicked
This commit is contained in:
Shivaram Lingamneni 2021-08-13 14:20:17 -04:00 committed by GitHub
commit 0d438dd0d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/handlers.go
View File

@ -1373,6 +1373,9 @@ func kickHandler(server *Server, client *Client, msg ircmsg.Message, rb *Respons
if len(msg.Params) > 2 { if len(msg.Params) > 2 {
comment = msg.Params[2] comment = msg.Params[2]
} }
if comment == "" {
comment = client.Nick()
}
for _, kick := range kicks { for _, kick := range kicks {
channel := server.channels.Get(kick.channel) channel := server.channels.Get(kick.channel)
if channel == nil { 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")) rb.Add(nil, server.name, ERR_NOSUCHNICK, client.nick, utils.SafeErrorParam(kick.nick), client.t("No such nick"))
continue continue
} }
if comment == "" {
comment = kick.nick
}
channel.Kick(client, target, comment, rb, hasPrivs) channel.Kick(client, target, comment, rb, hasPrivs)
} }
return false return false