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

Added support for GUILD_UPDATE event

Browse source
This commit is contained in:
Bruce Marriner 2015-11-13 09:48:56 -06:00
parent 3d9e980619
commit f885ce38d2
2 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
session.go
View file

@ -29,6 +29,7 @@ type Session struct {
OnChannelUpdate func(*Session, Channel) OnChannelUpdate func(*Session, Channel)
OnChannelDelete func(*Session, Channel) OnChannelDelete func(*Session, Channel)
OnGuildCreate func(*Session, Guild) OnGuildCreate func(*Session, Guild)
OnGuildUpdate func(*Session, Guild)
OnGuildDelete func(*Session, Guild) OnGuildDelete func(*Session, Guild)
OnGuildMemberAdd func(*Session, Member) OnGuildMemberAdd func(*Session, Member)
OnGuildMemberRemove func(*Session, Member) OnGuildMemberRemove func(*Session, Member)

35
wsapi.go
View file

@ -179,9 +179,9 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnReady != nil { if s.OnReady != nil {
var st Ready var st Ready
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(err) fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return return err
} }
s.OnReady(s, st) s.OnReady(s, st)
return return
@ -190,9 +190,9 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnVoiceStateUpdate != nil { if s.OnVoiceStateUpdate != nil {
var st VoiceState var st VoiceState
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(err) fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return return err
} }
s.OnVoiceStateUpdate(s, st) s.OnVoiceStateUpdate(s, st)
return return
@ -201,7 +201,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnPresenceUpdate != nil { if s.OnPresenceUpdate != nil {
var st PresenceUpdate var st PresenceUpdate
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(err) fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -212,6 +212,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnTypingStart != nil { if s.OnTypingStart != nil {
var st TypingStart var st TypingStart
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -222,6 +223,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnMessageCreate != nil { if s.OnMessageCreate != nil {
var st Message var st Message
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -232,6 +234,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnMessageUpdate != nil { if s.OnMessageUpdate != nil {
var st Message var st Message
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -242,6 +245,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnMessageDelete != nil { if s.OnMessageDelete != nil {
var st MessageDelete var st MessageDelete
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -252,6 +256,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnMessageAck != nil { if s.OnMessageAck != nil {
var st MessageAck var st MessageAck
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logging printJSON(e.RawData) // TODO: Better error logging
return err return err
} }
@ -262,6 +267,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnChannelCreate != nil { if s.OnChannelCreate != nil {
var st Channel var st Channel
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -272,6 +278,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnChannelUpdate != nil { if s.OnChannelUpdate != nil {
var st Channel var st Channel
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -282,6 +289,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnChannelDelete != nil { if s.OnChannelDelete != nil {
var st Channel var st Channel
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -292,16 +300,29 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnGuildCreate != nil { if s.OnGuildCreate != nil {
var st Guild var st Guild
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
s.OnGuildCreate(s, st) s.OnGuildCreate(s, st)
return return
} }
case "GUILD_UPDATE":
if s.OnGuildCreate != nil {
var st Guild
if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg
return err
}
s.OnGuildUpdate(s, st)
return
}
case "GUILD_DELETE": case "GUILD_DELETE":
if s.OnGuildDelete != nil { if s.OnGuildDelete != nil {
var st Guild var st Guild
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -312,6 +333,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnGuildMemberAdd != nil { if s.OnGuildMemberAdd != nil {
var st Member var st Member
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -322,6 +344,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnGuildMemberRemove != nil { if s.OnGuildMemberRemove != nil {
var st Member var st Member
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -332,6 +355,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnGuildMemberUpdate != nil { if s.OnGuildMemberUpdate != nil {
var st Member var st Member
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }
@ -350,6 +374,7 @@ func event(s *Session, messageType int, message []byte) (err error) {
if s.OnGuildIntegrationsUpdate != nil { if s.OnGuildIntegrationsUpdate != nil {
var st GuildIntegrationsUpdate var st GuildIntegrationsUpdate
if err := json.Unmarshal(e.RawData, &st); err != nil { if err := json.Unmarshal(e.RawData, &st); err != nil {
fmt.Println(e.Type, err)
printJSON(e.RawData) // TODO: Better error logginEventg printJSON(e.RawData) // TODO: Better error logginEventg
return err return err
} }