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

Merge pull request #1526 from slingamn/issue1516_amode_op 

fix #1516
This commit is contained in:
Shivaram Lingamneni 2021-02-09 13:59:29 -05:00 committed by GitHub
parent a9cae85052 7ce396931c
commit 9aeb80dbf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
irc/chanserv.go
View File

@ -288,10 +288,11 @@ func csOpHandler(service *ircService, server *Server, client *Client, command st
return return
} }
channelName := channelInfo.Name() channelName := channelInfo.Name()
founder := channelInfo.Founder()
clientAccount := client.Account() clientAccount := client.Account()
if clientAccount == "" || clientAccount != channelInfo.Founder() { if clientAccount == "" {
service.Notice(rb, client.t("Only the channel founder can do this")) service.Notice(rb, client.t("You're not logged into an account"))
return return
} }
@ -306,11 +307,26 @@ func csOpHandler(service *ircService, server *Server, client *Client, command st
target = client target = client
} }
// give them privs var givenMode modes.Mode
givenMode := modes.ChannelOperator if target == client {
if clientAccount == target.Account() { if clientAccount == founder {
givenMode = modes.ChannelFounder givenMode = modes.ChannelFounder
} else {
givenMode = channelInfo.getAmode(clientAccount)
if givenMode == modes.Mode(0) {
service.Notice(rb, client.t("You don't have any stored privileges on that channel"))
return
}
}
} else {
if clientAccount == founder {
givenMode = modes.ChannelOperator
} else {
service.Notice(rb, client.t("Only the channel founder can do this"))
return
}
} }
applied, change := channelInfo.applyModeToMember(client, applied, change := channelInfo.applyModeToMember(client,
modes.ModeChange{Mode: givenMode, modes.ModeChange{Mode: givenMode,
Op: modes.Add, Op: modes.Add,