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

Better error checking for New() and Gateway() funcs, closes #75

Browse source
This commit is contained in:
Bruce Marriner 2016-01-10 19:01:34 -06:00
parent 6f6b1d360c
commit b5e45827fd
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
discord.go
View file

@ -103,12 +103,14 @@ func New(args ...interface{}) (s *Session, err error) {
err = s.Open() err = s.Open()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return
} }
// Do websocket handshake. // Do websocket handshake.
err = s.Handshake() err = s.Handshake()
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return
} }
// Listen for events. // Listen for events.

14
restapi.go
View file

@ -674,9 +674,19 @@ func (s *Session) VoiceICE() (st *VoiceICE, err error) {
func (s *Session) Gateway() (gateway string, err error) { func (s *Session) Gateway() (gateway string, err error) {
response, err := s.Request("GET", GATEWAY, nil) response, err := s.Request("GET", GATEWAY, nil)
if err != nil {
return
}
temp := struct {
URL string `json:"url"`
}{}
var temp map[string]interface{}
err = json.Unmarshal(response, &temp) err = json.Unmarshal(response, &temp)
gateway = temp["url"].(string) if err != nil {
return
}
gateway = temp.URL
return return
} }