CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #685

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-03-18 06:55:30 -04:00
parent 9559ea6764
commit bd45c346dc
3 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
irc/chanserv.go
View file

@ -293,16 +293,17 @@ func csOpHandler(server *Server, client *Client, command string, params []string
}
func csRegisterHandler(server *Server, client *Client, command string, params []string, rb *ResponseBuffer) {
channelName := params[0]
channelKey, err := CasefoldChannel(channelName)
if err != nil {
csNotice(rb, client.t("Channel name is not valid"))
if server.Config().Channels.Registration.OperatorOnly && !client.HasRoleCapabs("chanreg") {
csNotice(rb, client.t("Channel registration is restricted to server operators"))
return
}
channelInfo := server.channels.Get(channelKey)
if channelInfo == nil || !channelInfo.ClientIsAtLeast(client, modes.ChannelOperator) {
channelName := params[0]
channelInfo := server.channels.Get(channelName)
if channelInfo == nil {
csNotice(rb, client.t("No such channel"))
return
}
if !channelInfo.ClientIsAtLeast(client, modes.ChannelOperator) {
csNotice(rb, client.t("You must be an oper on the channel to register it"))
return
}
@ -313,7 +314,7 @@ func csRegisterHandler(server *Server, client *Client, command string, params []
}
// this provides the synchronization that allows exactly one registration of the channel:
err = server.channels.SetRegistered(channelKey, account)
err := server.channels.SetRegistered(channelName, account)
if err != nil {
csNotice(rb, err.Error())
return