3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-25 13:29:27 +01:00

Merge pull request #1902 from slingamn/amode_v_join

fix #1901
This commit is contained in:
Shivaram Lingamneni 2022-01-19 01:15:58 -05:00 committed by GitHub
commit 86c5839044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -767,7 +767,8 @@ func (channel *Channel) Join(client *Client, key string, isSajoin bool, rb *Resp
return errWrongChannelKey, forward return errWrongChannelKey, forward
} }
if channel.flags.HasMode(modes.InviteOnly) && // #1901: +h and up exempt from all restrictions, but +v additionally exempts from +i:
if channel.flags.HasMode(modes.InviteOnly) && persistentMode == 0 &&
!channel.lists[modes.InviteMask].Match(details.nickMaskCasefolded) { !channel.lists[modes.InviteMask].Match(details.nickMaskCasefolded) {
return errInviteOnly, forward return errInviteOnly, forward
} }