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

Handle nil errors and default handler properly.

Browse source
This commit is contained in:
Chris Rhodes 2016-02-08 10:03:32 -08:00
parent 40b969d7c3
commit 7858f999b1
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wsapi.go
View file

@ -319,16 +319,24 @@ func (s *Session) event(messageType int, message []byte) {
var st *VoiceServerUpdate var st *VoiceServerUpdate
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
s.onVoiceServerUpdate(st) s.onVoiceServerUpdate(st)
s.OnVoiceServerUpdate(s, st) if s.OnVoiceServerUpdate != nil {
s.OnVoiceServerUpdate(s, st)
}
}
if s.OnVoiceServerUpdate != nil {
return
} }
return
case "VOICE_STATE_UPDATE": case "VOICE_STATE_UPDATE":
var st *VoiceState var st *VoiceState
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
s.onVoiceStateUpdate(st) s.onVoiceStateUpdate(st)
s.OnVoiceStateUpdate(s, st) if s.OnVoiceStateUpdate != nil {
s.OnVoiceStateUpdate(s, st)
}
}
if s.OnVoiceStateUpdate != nil {
return
} }
return
case "USER_UPDATE": case "USER_UPDATE":
if s.OnUserUpdate != nil { if s.OnUserUpdate != nil {
var st *User var st *User