gateway/gateway.go

@@ -11,7 +11,6 @@ import (
 	"context"
 	"net/http"
 	"net/url"
-	"strings"
 	"sync"
 	"time"
 
@@ -48,22 +47,19 @@ type BotData struct {
 // SessionStartLimit is the information on the current session start limit. It's
 // used in BotData.
 type SessionStartLimit struct {
-	Total          int                  `json:"total"`
-	Remaining      int                  `json:"remaining"`
-	ResetAfter     discord.Milliseconds `json:"reset_after"`
-	MaxConcurrency int                  `json:"max_concurrency"`
+	Total      int                  `json:"total"`
+	Remaining  int                  `json:"remaining"`
+	ResetAfter discord.Milliseconds `json:"reset_after"`
 }
 
 // URL asks Discord for a Websocket URL to the Gateway.
 func URL() (string, error) {
 	var g BotData
 
-	c := httputil.NewClient()
-	if err := c.RequestJSON(&g, "GET", EndpointGateway); err != nil {
-		return "", err
-	}
-
-	return g.URL, nil
+	return g.URL, httputil.NewClient().RequestJSON(
+		&g, "GET",
+		EndpointGateway,
+	)
 }
 
 // BotURL fetches the Gateway URL along with extra metadata. The token
@@ -143,31 +139,12 @@ func NewGatewayWithIntents(token string, intents ...Intents) (*Gateway, error) {
 	return g, nil
 }
 
-// NewGateway creates a new Gateway to the default Discord server.
+// NewGateway creates a new Gateway with the default stdlib JSON driver. For
+// more information, refer to NewGatewayWithDriver.
 func NewGateway(token string) (*Gateway, error) {
-	return NewIdentifiedGateway(DefaultIdentifier(token))
-}
-
-// NewIdentifiedGateway creates a new Gateway with the given gateway identifier
-// and the default everything. Sharded bots should prefer this function for the
-// shared identifier.
-func NewIdentifiedGateway(id *Identifier) (*Gateway, error) {
-	var gatewayURL string
-	var botData *BotData
-	var err error
-
-	if strings.HasPrefix(id.Token, "Bot ") {
-		botData, err = BotURL(id.Token)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get bot data")
-		}
-		gatewayURL = botData.URL
-
-	} else {
-		gatewayURL, err = URL()
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to get gateway endpoint")
-		}
+	URL, err := URL()
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get gateway endpoint")
 	}
 
 	// Parameters for the gateway
@@ -177,42 +154,18 @@ func NewIdentifiedGateway(id *Identifier) (*Gateway, error) {
 	}
 
 	// Append the form to the URL
-	gatewayURL += "?" + param.Encode()
-	gateway := NewCustomIdentifiedGateway(gatewayURL, id)
+	URL += "?" + param.Encode()
 
-	// Use the supplied connect rate limit, if any.
-	if botData != nil && botData.StartLimit != nil {
-		resetAt := time.Now().Add(botData.StartLimit.ResetAfter.Duration())
-		limiter := gateway.Identifier.IdentifyGlobalLimit
-
-		// Update the burst to be the current given time and reset it back to
-		// the default when the given time is reached.
-		limiter.SetBurst(botData.StartLimit.Remaining)
-		limiter.SetBurstAt(resetAt, botData.StartLimit.Total)
-
-		// Update the maximum number of identify requests allowed per 5s.
-		gateway.Identifier.IdentifyShortLimit.SetBurst(botData.StartLimit.MaxConcurrency)
-	}
-
-	return gateway, nil
+	return NewCustomGateway(URL, token), nil
 }
 
-// NewCustomGateway creates a new Gateway with a custom gateway URL and a new
-// Identifier. Most bots connecting to the official server should not use these
-// custom functions.
 func NewCustomGateway(gatewayURL, token string) *Gateway {
-	return NewCustomIdentifiedGateway(gatewayURL, DefaultIdentifier(token))
-}
-
-// NewCustomIdentifiedGateway creates a new Gateway with a custom gateway URL
-// and a pre-existing Identifier. Refer to NewCustomGateway.
-func NewCustomIdentifiedGateway(gatewayURL string, id *Identifier) *Gateway {
 	return &Gateway{
 		WS:        wsutil.NewCustom(wsutil.NewConn(), gatewayURL),
 		WSTimeout: wsutil.WSTimeout,
 
 		Events:     make(chan Event, wsutil.WSBuffer),
-		Identifier: id,
+		Identifier: DefaultIdentifier(token),
 		Sequence:   moreatomic.NewInt64(0),
 
 		ErrorLog:   wsutil.WSError,

gateway/integration_test.go

@@ -21,21 +21,6 @@ func init() {
 	}
 }
 
-func TestURL(t *testing.T) {
-	u, err := URL()
-	if err != nil {
-		t.Fatal("failed to get gateway URL:", err)
-	}
-
-	if u == "" {
-		t.Fatal("gateway URL is empty")
-	}
-
-	if !strings.HasPrefix(u, "wss://") {
-		t.Fatal("gatewayURL is invalid:", u)
-	}
-}
-
 func TestInvalidToken(t *testing.T) {
 	g, err := NewGateway("bad token")
 	if err != nil {