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

Close.

Browse source
This commit is contained in:
Chris Rhodes 2016-01-23 20:24:52 -08:00
parent ad1d0fac60
commit 25a1b2ea48
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
wsapi.go
View file

@ -11,8 +11,14 @@
package discordgo package discordgo
import ( import (
"bytes"
"compress/flate"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"io"
"io/ioutil"
"net/http"
"runtime" "runtime"
"time" "time"
@ -31,6 +37,7 @@ type handshakeData struct {
Version int `json:"v"` Version int `json:"v"`
Token string `json:"token"` Token string `json:"token"`
Properties handshakeProperties `json:"properties"` Properties handshakeProperties `json:"properties"`
Compress bool `json:"compress"`
} }
type handshakeOp struct { type handshakeOp struct {
@ -58,14 +65,17 @@ func (s *Session) Open() (err error) {
return return
} }
header := http.Header{}
header.Add("accept-encoding", "gzip, deflate")
// TODO: See if there's a use for the http response. // TODO: See if there's a use for the http response.
// conn, response, err := websocket.DefaultDialer.Dial(session.Gateway, nil) // conn, response, err := websocket.DefaultDialer.Dial(session.Gateway, nil)
s.wsConn, _, err = websocket.DefaultDialer.Dial(g, nil) s.wsConn, _, err = websocket.DefaultDialer.Dial(g, header)
if err != nil { if err != nil {
return return
} }
err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{3, s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}}}) err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{3, s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, true}})
if err != nil { if err != nil {
return return
} }
@ -261,14 +271,27 @@ func (s *Session) event(messageType int, message []byte) (err error) {
printJSON(message) printJSON(message)
} }
var reader io.Reader
reader = bytes.NewBuffer(message)
if messageType == 2 {
ioutil.WriteFile("ready", message, 0644)
f := flate.NewReader(reader)
defer f.Close()
reader = f
}
decoder := json.NewDecoder(reader)
var e *Event var e *Event
if err = unmarshal(message, &e); err != nil { if err = decoder.Decode(&e); err != nil {
fmt.Println(err) fmt.Println(err)
return return
} }
switch e.Type { switch e.Type {
case "READY": case "READY":
fmt.Println(messageType, e)
var st *Ready var st *Ready
if err = unmarshalEvent(e, &st); err == nil { if err = unmarshalEvent(e, &st); err == nil {
go s.heartbeat(s.wsConn, s.listening, st.HeartbeatInterval) go s.heartbeat(s.wsConn, s.listening, st.HeartbeatInterval)