change int64 -> null.Int64

discord.go

@@ -14,9 +14,14 @@
 package discordgo
 
 import (
+	"context"
 	"errors"
 	"fmt"
+	"github.com/hashicorp/go-cleanhttp"
+	"log"
 	"net/http"
+	"strconv"
+	"strings"
 	"time"
 )
 
@@ -56,10 +61,15 @@ func New(args ...interface{}) (s *Session, err error) {
 		ShouldReconnectOnError: true,
 		ShardID:                0,
 		ShardCount:             1,
-		MaxRestRetries:         3,
-		Client:                 &http.Client{Timeout: (20 * time.Second)},
-		sequence:               new(int64),
+		MaxRestRetries:         10,
+		Client:                 cleanhttp.DefaultPooledClient(),
 		LastHeartbeatAck:       time.Now().UTC(),
+		tokenInvalid:           new(int32),
+	}
+
+	s.GatewayManager = &GatewayConnectionManager{
+		session:          s,
+		voiceConnections: make(map[int64]*VoiceConnection),
 	}
 
 	// If no arguments are passed return the empty Session interface.
@@ -144,3 +154,31 @@ func New(args ...interface{}) (s *Session, err error) {
 
 	return
 }
+
+func CheckRetry(_ context.Context, resp *http.Response, err error) (bool, error) {
+	if err != nil {
+		return true, err
+	}
+
+	return false, nil
+}
+
+type retryableLogger struct{}
+
+func (r *retryableLogger) Printf(format string, args ...interface{}) {
+	s := fmt.Sprintf(format, args...)
+
+	if strings.Contains(s, "[DEBUG]") {
+		return
+	}
+
+	if strings.HasSuffix(s, "\n") {
+		s = s[:len(s)-1]
+	}
+
+	log.Println(s)
+}
+
+func StrID(id int64) string {
+	return strconv.FormatInt(id, 10)
+}

discord_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"runtime"
+	"strconv"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -15,13 +16,18 @@ var (
 	dg    *Session // Stores a global discordgo user session
 	dgBot *Session // Stores a global discordgo bot session
 
-	envToken    = os.Getenv("DGU_TOKEN")  // Token to use when authenticating the user account
-	envBotToken = os.Getenv("DGB_TOKEN")  // Token to use when authenticating the bot account
-	envGuild    = os.Getenv("DG_GUILD")   // Guild ID to use for tests
-	envChannel  = os.Getenv("DG_CHANNEL") // Channel ID to use for tests
-	envAdmin    = os.Getenv("DG_ADMIN")   // User ID of admin user to use for tests
+	envToken    = os.Getenv("DGU_TOKEN")           // Token to use when authenticating the user account
+	envBotToken = os.Getenv("DGB_TOKEN")           // Token to use when authenticating the bot account
+	envGuild    = parseID(os.Getenv("DG_GUILD"))   // Guild ID to use for tests
+	envChannel  = parseID(os.Getenv("DG_CHANNEL")) // Channel ID to use for tests
+	envAdmin    = parseID(os.Getenv("DG_ADMIN"))   // User ID of admin user to use for tests
 )
 
+func parseID(str string) int64 {
+	id, _ := strconv.ParseInt(str, 10, 64)
+	return id
+}
+
 func init() {
 	fmt.Println("Init is being called.")
 	if envBotToken != "" {
@@ -103,12 +109,9 @@ func TestOpenClose(t *testing.T) {
 	// this is totally gross.
 	start := time.Now()
 	for {
-		d.RLock()
-		if d.DataReady {
-			d.RUnlock()
+		if d.GatewayManager.Status() == GatewayStatusReady {
 			break
 		}
-		d.RUnlock()
 
 		if time.Since(start) > 10*time.Second {
 			t.Fatal("DataReady never became true.yy")