Skip to content

Commit

Permalink
Make compression optional, clean up some comments and unused fields.
Browse files Browse the repository at this point in the history
  • Loading branch information
iopred committed Jan 24, 2016
1 parent 5a3740d commit fd32614
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
22 changes: 9 additions & 13 deletions structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,24 @@ type Session struct {
VoiceReady bool // Set to true when Voice Websocket is ready
UDPReady bool // Set to true when UDP Connection is ready

// Other..
// The websocket connection.
wsConn *websocket.Conn
//TODO, add bools for like.
// are we connnected to websocket?
// have we authenticated to login?
// lets put all the general session
// tracking and infos here.. clearly

// Everything below here is used for Voice testing.
// This stuff is almost guarenteed to change a lot
// and is even a bit hackish right now.
Voice *Voice // Stores all details related to voice connections
// Stores all details related to voice connections
Voice *Voice

// Managed state object, updated with events.
State *State
StateEnabled bool
StateMaxMessageCount int
State *State
StateEnabled bool

// When nil, the session is not listening.
listening chan interface{}

// Should the session reconnect the websocket on errors.
ShouldReconnectOnError bool

// Should the session request compressed websocket data.
Compress bool
}

// A VoiceRegion stores data for a specific voice region server.
Expand Down
2 changes: 1 addition & 1 deletion wsapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func (s *Session) Open() (err error) {
return
}

err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{3, s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, true}})
err = s.wsConn.WriteJSON(handshakeOp{2, handshakeData{3, s.Token, handshakeProperties{runtime.GOOS, "Discordgo v" + VERSION, "", "", ""}, s.Compress}})
if err != nil {
return
}
Expand Down

0 comments on commit fd32614

Please sign in to comment.