GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1434 from slingamn/need_privs 

change FAIL codes from NOT_PRIVED to PRIVS_NEEDED
This commit is contained in:
Shivaram Lingamneni 2020-12-06 23:28:04 -08:00 committed by GitHub
parent 937e519595 30b514cf95
commit 8c2d0762e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
irc/channel.go
View File

@ -1571,7 +1571,7 @@ func (channel *Channel) Uninvite(invitee *Client, inviter *Client, rb *ResponseB
}
if !channel.ClientIsAtLeast(inviter, modes.ChannelOperator) {
rb.Add(nil, channel.server.name, "FAIL", "UNINVITE", "NOT_PRIVED", channel.Name(), inviter.t("You're not a channel operator"))
rb.Add(nil, channel.server.name, "FAIL", "UNINVITE", "PRIVS_NEEDED", channel.Name(), inviter.t("You're not a channel operator"))
return
}

2
irc/handlers.go
View File

@ -2548,7 +2548,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *
allowedToRelay := client.HasRoleCapabs("relaymsg") || (config.Server.Relaymsg.AvailableToChanops && channel.ClientIsAtLeast(client, modes.ChannelOperator))
if !allowedToRelay {
rb.Add(nil, server.name, "FAIL", "RELAYMSG", "NOT_PRIVED", client.t("You cannot relay messages to this channel"))
rb.Add(nil, server.name, "FAIL", "RELAYMSG", "PRIVS_NEEDED", client.t("You cannot relay messages to this channel"))
return false
}

2
irctest

@ -1 +1 @@
Subproject commit 8c66157a9ea22a824dc55210903222889cc3672d
Subproject commit 5aeb297de549c714ca692eda87d72b179d039ca6