瀏覽代碼

Merge pull request #1902 from slingamn/amode_v_join

fix #1901
tags/v2.10.0-rc1
Shivaram Lingamneni 2 年之前
父節點
當前提交
86c5839044
沒有連結到貢獻者的電子郵件帳戶。
共有 1 個檔案被更改,包括 2 行新增1 行删除
  1. 2
    1
      irc/channel.go

+ 2
- 1
irc/channel.go 查看文件

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

Loading…
取消
儲存