pothtonswer/discordmuffin
1
0
Fork 1
Code Issues 2 Pull requests 1 Projects 2 Releases Packages Wiki Activity Actions

ChannelVoiceJoin now waits for the connection.

Browse source 
You can return to the previous behaviour just by calling
the function as a goroutine.  However I feel most uses of it
require the connection to be ready before the next step.
This commit is contained in:
Bruce Marriner 2016-03-15 08:30:05 -05:00
parent 1cc1d4c9bb
commit 7ec5304bc9
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
wsapi.go
View file

@ -336,23 +336,19 @@ type voiceChannelJoinOp struct {
// cID : Channel ID of the channel to join. // cID : Channel ID of the channel to join.
// mute : If true, you will be set to muted upon joining. // mute : If true, you will be set to muted upon joining.
// deaf : If true, you will be set to deafened upon joining. // deaf : If true, you will be set to deafened upon joining.
// timeout : If timeout > 0 then func will wait up to timeout for voice func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool) (voice *VoiceConnection, err error) {
// connection to be ready. If it does not become ready in that
// time frame then it will return an error and close out the voice
// connection entirely.
func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool, timeout int) (voice *VoiceConnection, err error) {
// If a voice connection alreadyy exists for this guild then // If a voice connection alreadyy exists for this guild then
// return that connection. If the channel differs, also change channels. // return that connection. If the channel differs, also change channels.
// TODO: check if the voice connection is really valid or just a shell // TODO: check if the voice connection is really valid or just a shell
// because we might want to allow setting variables prior to getting here // because we might want to allow setting variables prior to getting here
// like debug, and other things. // like debug, and other things.
if voice, ok := s.VoiceConnections[gID]; ok { var ok bool
if voice, ok = s.VoiceConnections[gID]; ok {
if voice.ChannelID != cID { if voice.ChannelID != cID {
err = voice.ChangeChannel(cID) err = voice.ChangeChannel(cID)
} }
return voice, err return
// TODO: ugh, ugly..
} }
// Create a new voice session // Create a new voice session
@ -366,7 +362,7 @@ func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool, timeout int
ChannelID: cID, ChannelID: cID,
} }
// Store voice in VoiceConnections map for thils GuildID // Store voice in VoiceConnections map for this GuildID
s.VoiceConnections[gID] = voice s.VoiceConnections[gID] = voice
// Send the request to Discord that we want to join the voice channel // Send the request to Discord that we want to join the voice channel
@ -377,13 +373,11 @@ func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool, timeout int
} }
// doesn't exactly work perfect yet.. TODO // doesn't exactly work perfect yet.. TODO
if timeout > 0 { err = voice.WaitUntilConnected()
err = voice.WaitUntilConnected() if err != nil {
if err != nil { voice.Close()
voice.Close() delete(s.VoiceConnections, gID)
delete(s.VoiceConnections, gID) return
return
}
} }
return return