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

Fix subtle difference between events with state tracking and not, when the handler is null.

Browse source
This commit is contained in:
Chris Rhodes 2016-01-08 10:39:24 -08:00
parent 07057f8e71
commit f05f79e24d
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
wsapi.go
View file

@ -173,6 +173,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
s.OnReady(s, st) s.OnReady(s, st)
} }
go s.Heartbeat(st.HeartbeatInterval) go s.Heartbeat(st.HeartbeatInterval)
} else if s.OnReady == nil {
break
} }
return return
case "VOICE_SERVER_UPDATE": case "VOICE_SERVER_UPDATE":
@ -262,6 +264,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnChannelCreate != nil { if s.OnChannelCreate != nil {
s.OnChannelCreate(s, st) s.OnChannelCreate(s, st)
} }
} else if s.OnChannelCreate == nil {
break
} }
return return
case "CHANNEL_UPDATE": case "CHANNEL_UPDATE":
@ -276,6 +280,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnChannelUpdate != nil { if s.OnChannelUpdate != nil {
s.OnChannelUpdate(s, st) s.OnChannelUpdate(s, st)
} }
} else if s.OnChannelUpdate == nil {
break
} }
return return
case "CHANNEL_DELETE": case "CHANNEL_DELETE":
@ -290,6 +296,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnChannelDelete != nil { if s.OnChannelDelete != nil {
s.OnChannelDelete(s, st) s.OnChannelDelete(s, st)
} }
} else if s.OnChannelDelete == nil {
break
} }
return return
case "GUILD_CREATE": case "GUILD_CREATE":
@ -304,6 +312,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildCreate != nil { if s.OnGuildCreate != nil {
s.OnGuildCreate(s, st) s.OnGuildCreate(s, st)
} }
} else if s.OnGuildCreate == nil {
break
} }
return return
case "GUILD_UPDATE": case "GUILD_UPDATE":
@ -318,6 +328,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildCreate != nil { if s.OnGuildCreate != nil {
s.OnGuildUpdate(s, st) s.OnGuildUpdate(s, st)
} }
} else if s.OnGuildUpdate == nil {
break
} }
return return
case "GUILD_DELETE": case "GUILD_DELETE":
@ -332,6 +344,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildDelete != nil { if s.OnGuildDelete != nil {
s.OnGuildDelete(s, st) s.OnGuildDelete(s, st)
} }
} else if s.OnGuildDelete == nil {
break
} }
return return
case "GUILD_MEMBER_ADD": case "GUILD_MEMBER_ADD":
@ -346,6 +360,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildMemberAdd != nil { if s.OnGuildMemberAdd != nil {
s.OnGuildMemberAdd(s, st) s.OnGuildMemberAdd(s, st)
} }
} else if s.OnGuildMemberAdd == nil {
break
} }
return return
case "GUILD_MEMBER_REMOVE": case "GUILD_MEMBER_REMOVE":
@ -360,6 +376,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildMemberRemove != nil { if s.OnGuildMemberRemove != nil {
s.OnGuildMemberRemove(s, st) s.OnGuildMemberRemove(s, st)
} }
} else if s.OnGuildMemberRemove == nil {
break
} }
return return
case "GUILD_MEMBER_UPDATE": case "GUILD_MEMBER_UPDATE":
@ -374,6 +392,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildMemberUpdate != nil { if s.OnGuildMemberUpdate != nil {
s.OnGuildMemberUpdate(s, st) s.OnGuildMemberUpdate(s, st)
} }
} else if s.OnGuildMemberUpdate == nil {
break
} }
return return
case "GUILD_ROLE_CREATE": case "GUILD_ROLE_CREATE":
@ -436,6 +456,8 @@ func (s *Session) event(messageType int, message []byte) (err error) {
if s.OnGuildEmojisUpdate != nil { if s.OnGuildEmojisUpdate != nil {
s.OnGuildEmojisUpdate(s, st) s.OnGuildEmojisUpdate(s, st)
} }
} else if s.OnGuildEmojisUpdate == nil {
break
} }
return return
case "USER_SETTINGS_UPDATE": case "USER_SETTINGS_UPDATE":