migan/discordmuffin
1
0
Fork 0
forked from pothtonswer/discordmuffin
Code Pull requests Activity

Remove code duplication in ChannelVoiceJoin (#611)

Browse source
This commit is contained in:
robbix1206 2018-11-06 02:37:18 +01:00 committed by Chris Rhodes
parent e184c57068
commit aca3f3898c
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wsapi.go
View file

@ -615,11 +615,7 @@ func (s *Session) ChannelVoiceJoin(gID, cID string, mute, deaf bool) (voice *Voi
voice.session = s voice.session = s
voice.Unlock() voice.Unlock()
// Send the request to Discord that we want to join the voice channel err = s.ChannelVoiceJoinManual(gID, cID, mute, deaf)
data := voiceChannelJoinOp{4, voiceChannelJoinData{&gID, &cID, mute, deaf}}
s.wsMutex.Lock()
err = s.wsConn.WriteJSON(data)
s.wsMutex.Unlock()
if err != nil { if err != nil {
return return
} }
@ -652,10 +648,6 @@ func (s *Session) ChannelVoiceJoinManual(gID, cID string, mute, deaf bool) (err
s.wsMutex.Lock() s.wsMutex.Lock()
err = s.wsConn.WriteJSON(data) err = s.wsConn.WriteJSON(data)
s.wsMutex.Unlock() s.wsMutex.Unlock()
if err != nil {
return
}
return return
} }