|
@@ -86,8 +86,18 @@ func (i *IRCCat) signalHandler() {
|
86
|
86
|
func (i *IRCCat) connectIRC() error {
|
87
|
87
|
irccon := irc.IRC(viper.GetString("irc.nick"), viper.GetString("irc.realname"))
|
88
|
88
|
i.irc = irccon
|
89
|
|
- irccon.RequestCaps = []string{"away-notify", "account-notify", "draft/message-tags-0.2"}
|
|
89
|
+ // requesting any caps breaks SASL
|
|
90
|
+ // irccon.RequestCaps = []string{"away-notify", "account-notify", "draft/message-tags-0.2"}
|
90
|
91
|
irccon.UseTLS = viper.GetBool("irc.tls")
|
|
92
|
+ if viper.IsSet("irc.sasl_pass") && viper.GetString("irc.sasl_pass") != "" {
|
|
93
|
+ if viper.IsSet("irc.sasl_login") && viper.GetString("irc.sasl_login") != "" {
|
|
94
|
+ irccon.SASLLogin = viper.GetString("irc.sasl_login")
|
|
95
|
+ } else {
|
|
96
|
+ irccon.SASLLogin = viper.GetString("irc.nick")
|
|
97
|
+ }
|
|
98
|
+ irccon.SASLPassword = viper.GetString("irc.sasl_pass")
|
|
99
|
+ irccon.UseSASL = true
|
|
100
|
+ }
|
91
|
101
|
if viper.GetBool("irc.tls_skip_verify") {
|
92
|
102
|
irccon.TLSConfig = &tls.Config{InsecureSkipVerify: true}
|
93
|
103
|
}
|