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

Don't unmarshall if it won't be used.

Browse source
This commit is contained in:
Chris Rhodes 2016-01-08 10:24:29 -08:00
parent 59ed5b0b40
commit c842676deb
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
wsapi.go
View file

@ -251,6 +251,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
return return
} }
case "CHANNEL_CREATE": case "CHANNEL_CREATE":
if !s.StateEnabled && s.OnChannelCreate == nil {
return
}
var st Channel var st Channel
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -262,6 +265,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "CHANNEL_UPDATE": case "CHANNEL_UPDATE":
if !s.StateEnabled && s.OnChannelUpdate == nil {
return
}
var st Channel var st Channel
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -273,6 +279,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "CHANNEL_DELETE": case "CHANNEL_DELETE":
if !s.StateEnabled && s.OnChannelDelete == nil {
return
}
var st Channel var st Channel
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -284,6 +293,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "GUILD_CREATE": case "GUILD_CREATE":
if !s.StateEnabled && s.OnGuildCreate == nil {
return
}
var st Guild var st Guild
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -295,6 +307,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "GUILD_UPDATE": case "GUILD_UPDATE":
if !s.StateEnabled && s.OnGuildUpdate == nil {
return
}
var st Guild var st Guild
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -306,6 +321,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "GUILD_DELETE": case "GUILD_DELETE":
if !s.StateEnabled && s.OnGuildDelete == nil {
return
}
var st Guild var st Guild
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -317,6 +335,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "GUILD_MEMBER_ADD": case "GUILD_MEMBER_ADD":
if !s.StateEnabled && s.OnGuildMemberAdd == nil {
return
}
var st Member var st Member
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -329,6 +350,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
return return
case "GUILD_MEMBER_REMOVE": case "GUILD_MEMBER_REMOVE":
var st Member var st Member
if !s.StateEnabled && s.OnGuildMemberRemove == nil {
return
}
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
s.State.MemberRemove(&st) s.State.MemberRemove(&st)
@ -339,6 +363,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
} }
return return
case "GUILD_MEMBER_UPDATE": case "GUILD_MEMBER_UPDATE":
if !s.StateEnabled && s.OnGuildMemberUpdate == nil {
return
}
var st Member var st Member
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {
@ -398,6 +425,9 @@ func (s *Session) event(messageType int, message []byte) (err error) {
return return
} }
case "GUILD_EMOJIS_UPDATE": case "GUILD_EMOJIS_UPDATE":
if !s.StateEnabled && s.OnGuildEmojisUpdate == nil {
return
}
var st GuildEmojisUpdate var st GuildEmojisUpdate
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
if s.StateEnabled { if s.StateEnabled {