mirror of
https://github.com/ergochat/ergo.git
synced 2024-11-11 06:29:29 +01:00
Merge pull request #1434 from slingamn/need_privs
change FAIL codes from NOT_PRIVED to PRIVS_NEEDED
This commit is contained in:
commit
8c2d0762e4
@ -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
|
||||
}
|
||||
|
||||
|
@ -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
2
irctest
@ -1 +1 @@
|
||||
Subproject commit 8c66157a9ea22a824dc55210903222889cc3672d
|
||||
Subproject commit 5aeb297de549c714ca692eda87d72b179d039ca6
|
Loading…
Reference in New Issue
Block a user