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

Merge pull request #171 from iopred/develop

Browse source 
Fix unmarshall error with Invite, improve error logging.
This commit is contained in:
Bruce 2016-04-23 22:35:51 -05:00
commit b14a2ce8da
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
restapi.go
View file

@ -1108,10 +1108,10 @@ func (s *Session) ChannelInvites(channelID string) (st []*Invite, err error) {
func (s *Session) ChannelInviteCreate(channelID string, i Invite) (st *Invite, err error) { func (s *Session) ChannelInviteCreate(channelID string, i Invite) (st *Invite, err error) {
data := struct { data := struct {
MaxAge int `json:"max_age"` MaxAge int `json:"max_age"`
MaxUses int `json:"max_uses"` MaxUses int `json:"max_uses"`
Temporary bool `json:"temporary"` Temporary bool `json:"temporary"`
XKCDPass bool `json:"xkcdpass"` XKCDPass string `json:"xkcdpass"`
}{i.MaxAge, i.MaxUses, i.Temporary, i.XkcdPass} }{i.MaxAge, i.MaxUses, i.Temporary, i.XkcdPass}
body, err := s.Request("POST", CHANNEL_INVITES(channelID), data) body, err := s.Request("POST", CHANNEL_INVITES(channelID), data)

2
structs.go
View file

@ -111,7 +111,7 @@ type Invite struct {
MaxAge int `json:"max_age"` MaxAge int `json:"max_age"`
Uses int `json:"uses"` Uses int `json:"uses"`
MaxUses int `json:"max_uses"` MaxUses int `json:"max_uses"`
XkcdPass bool `json:"xkcdpass"` XkcdPass string `json:"xkcdpass"`
Revoked bool `json:"revoked"` Revoked bool `json:"revoked"`
Temporary bool `json:"temporary"` Temporary bool `json:"temporary"`
} }

9
wsapi.go
View file

@ -15,6 +15,7 @@ import (
"compress/zlib" "compress/zlib"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -270,7 +271,7 @@ func (s *Session) event(messageType int, message []byte) {
if messageType == 2 { if messageType == 2 {
z, err1 := zlib.NewReader(reader) z, err1 := zlib.NewReader(reader)
if err1 != nil { if err1 != nil {
log.Println(err1) log.Println(fmt.Sprintf("Error uncompressing message type %d: %s", messageType, err1))
return return
} }
defer func() { defer func() {
@ -285,7 +286,7 @@ func (s *Session) event(messageType int, message []byte) {
var e *Event var e *Event
decoder := json.NewDecoder(reader) decoder := json.NewDecoder(reader)
if err = decoder.Decode(&e); err != nil { if err = decoder.Decode(&e); err != nil {
log.Println(err) log.Println(fmt.Sprintf("Error decoding message type %d: %s", messageType, err))
return return
} }
@ -300,8 +301,8 @@ func (s *Session) event(messageType int, message []byte) {
// Attempt to unmarshal our event. // Attempt to unmarshal our event.
// If there is an error we should handle the event itself. // If there is an error we should handle the event itself.
if err = unmarshal(e.RawData, i); err != nil { if err = json.Unmarshal(e.RawData, i); err != nil {
log.Println("Unable to unmarshal event data.", err) log.Println(fmt.Sprintf("Unable to unmarshal event %s data: %s", e.Type, err))
// Ready events must fire, even if they are empty. // Ready events must fire, even if they are empty.
if e.Type != "READY" { if e.Type != "READY" {
i = nil i = nil