GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2025-02-16 21:50:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1877 from slingamn/issue1876_invite_ban

Browse Source 
fix #1876
This commit is contained in:
Shivaram Lingamneni 2021-12-19 20:58:51 -05:00 committed by GitHub
commit 8b74cd1fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
irc/channel.go
View File

@ -1513,7 +1513,8 @@ func (channel *Channel) Invite(invitee *Client, inviter *Client, rb *ResponseBuf
} }
inviteOnly := channel.flags.HasMode(modes.InviteOnly) inviteOnly := channel.flags.HasMode(modes.InviteOnly)
if inviteOnly && !channel.ClientIsAtLeast(inviter, modes.ChannelOperator) { hasPrivs := channel.ClientIsAtLeast(inviter, modes.ChannelOperator)
if inviteOnly && !hasPrivs {
rb.Add(nil, inviter.server.name, ERR_CHANOPRIVSNEEDED, inviter.Nick(), chname, inviter.t("You're not a channel operator")) rb.Add(nil, inviter.server.name, ERR_CHANOPRIVSNEEDED, inviter.Nick(), chname, inviter.t("You're not a channel operator"))
return return
} }
@ -1523,7 +1524,10 @@ func (channel *Channel) Invite(invitee *Client, inviter *Client, rb *ResponseBuf
return return
} }
if inviteOnly { // #1876: INVITE should override all join restrictions, including +b and +l,
// not just +i. so we need to record it on a per-client basis iff the inviter
// is privileged:
if hasPrivs {
invitee.Invite(chcfname, createdAt) invitee.Invite(chcfname, createdAt)
} }