Reconnect to voice gateway instead of..

This commit is contained in:
Bruce Marriner 2016-05-28 14:58:44 -05:00
parent ff0a39b9b5
commit 7039cc47dc

View file

@ -320,7 +320,7 @@ func (v *VoiceConnection) wsListen(wsConn *websocket.Conn, close <-chan struct{}
v.RUnlock() v.RUnlock()
if sameConnection { if sameConnection {
v.log(LogError, "voice endpoint %s websocket closed unexpectantly,i %s", v.endpoint, err) v.log(LogError, "voice endpoint %s websocket closed unexpectantly, %s", v.endpoint, err)
// Start reconnect goroutine then exit. // Start reconnect goroutine then exit.
go v.reconnect() go v.reconnect()
@ -835,16 +835,29 @@ func (v *VoiceConnection) reconnect() {
} }
if v.session.DataReady == false { if v.session.DataReady == false {
v.log(LogInformational, "cannot reconenct with unready session") v.log(LogInformational, "cannot reconenct with unready session")
} else { } else {
v.log(LogInformational, "trying to reconnect to voice") v.log(LogInformational, "trying to reconnect to voice")
/*
// TODO: Move this to a 2nd stage
_, err := v.session.ChannelVoiceJoin(v.GuildID, v.ChannelID, v.mute, v.deaf) _, err := v.session.ChannelVoiceJoin(v.GuildID, v.ChannelID, v.mute, v.deaf)
if err == nil { if err == nil {
v.log(LogInformational, "successfully reconnected to voice") v.log(LogInformational, "successfully reconnected to voice")
return return
} }
*/
err := v.open()
if err == nil {
v.log(LogInformational, "successfully reconnected to voice")
return
}
v.log(LogError, "error reconnecting to voice, %s", err)
} }
<-time.After(wait * time.Second) <-time.After(wait * time.Second)