GitHub/matterbridge
3
0
Fork 0
mirror of https://github.com/42wim/matterbridge.git synced 2024-12-19 17:42:35 +01:00
Code Issues Projects Releases Wiki Activity

Make reconnection more robust (irc). #153

Browse Source
This commit is contained in:
Wim 2017-06-18 00:13:10 +02:00
parent 2a403f8b85
commit 75fb2b8156
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bridge/irc/irc.go
View File

@ -15,14 +15,15 @@ import (
) )
type Birc struct { type Birc struct {
i *irc.Connection i *irc.Connection
Nick string Nick string
names map[string][]string names map[string][]string
Config *config.Protocol Config *config.Protocol
Remote chan config.Message Remote chan config.Message
connected chan struct{} connected chan struct{}
Local chan config.Message // local queue for flood control Local chan config.Message // local queue for flood control
Account string Account string
FirstConnection bool
} }
var flog *log.Entry var flog *log.Entry
@ -49,6 +50,7 @@ func New(cfg config.Protocol, account string, c chan config.Message) *Birc {
if b.Config.MessageLength == 0 { if b.Config.MessageLength == 0 {
b.Config.MessageLength = 400 b.Config.MessageLength = 400
} }
b.FirstConnection = true
return b return b
} }
@ -74,6 +76,8 @@ func (b *Birc) Connect() error {
i.SASLLogin = b.Config.NickServNick i.SASLLogin = b.Config.NickServNick
i.SASLPassword = b.Config.NickServPassword i.SASLPassword = b.Config.NickServPassword
i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.SkipTLSVerify} i.TLSConfig = &tls.Config{InsecureSkipVerify: b.Config.SkipTLSVerify}
i.KeepAlive = time.Minute
i.PingFreq = time.Minute
if b.Config.Password != "" { if b.Config.Password != "" {
i.Password = b.Config.Password i.Password = b.Config.Password
} }
@ -90,6 +94,14 @@ func (b *Birc) Connect() error {
return fmt.Errorf("connection timed out") return fmt.Errorf("connection timed out")
} }
i.Debug = false i.Debug = false
// clear on reconnects
i.ClearCallback(ircm.RPL_WELCOME)
i.AddCallback(ircm.RPL_WELCOME, func(event *irc.Event) {
b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS}
// set our correct nick on reconnect if necessary
b.Nick = event.Nick
})
go i.Loop()
go b.doSend() go b.doSend()
return nil return nil
} }
@ -217,6 +229,11 @@ func (b *Birc) handleOther(event *irc.Event) {
} }
func (b *Birc) handlePrivMsg(event *irc.Event) { func (b *Birc) handlePrivMsg(event *irc.Event) {
b.Nick = b.i.GetNick()
// freenode doesn't send 001 as first reply
if event.Code == "NOTICE" {
return
}
// don't forward queries to the bot // don't forward queries to the bot
if event.Arguments[0] == b.Nick { if event.Arguments[0] == b.Nick {
return return