Integrated rate limiter

api/api.go

@@ -3,6 +3,7 @@ package api
 import (
 	"net/http"
 
+	"github.com/diamondburned/arikawa/api/rate"
 	"github.com/diamondburned/arikawa/httputil"
 )
 
@@ -20,13 +21,16 @@ var UserAgent = "DiscordBot (https://github.com/diamondburned/arikawa, v0.0.1)"
 
 type Client struct {
 	httputil.Client
+	Limiter *rate.Limiter
+
 	Token string
 }
 
 func NewClient(token string) *Client {
 	cli := &Client{
-		Client: httputil.NewClient(),
+		Client:  httputil.NewClient(),
-		Token:  token,
+		Limiter: rate.NewLimiter(),
+		Token:   token,
 	}
 
 	tw := httputil.NewTransportWrapper()
@@ -41,7 +45,11 @@ func NewClient(token string) *Client {
 
 		r.Header.Set("X-RateLimit-Precision", "millisecond")
 
-		return nil
+		// Rate limit stuff
+		return cli.Limiter.Acquire(r.Context(), r.URL.Path)
+	}
+	tw.Post = func(r *http.Response) error {
+		return cli.Limiter.Release(r.Request.URL.Path, r.Header)
 	}
 
 	cli.Client.Transport = tw

api/rate/rate.go

@@ -61,6 +61,8 @@ func NewLimiter() *Limiter {
 }
 
 func (l *Limiter) getBucket(path string, store bool) *bucket {
+	path = ParseBucketKey(path)
+
 	bc, ok := l.buckets.Load(path)
 	if !ok && !store {
 		return nil

httputil/url.go

@@ -1,15 +0,0 @@
-package httputil
-
-import "fmt"
-
-// URL extends the normal URL and allows for a general string.
-type URL struct {
-	Base string
-	URL  string
-}
-
-func URLf(base string, v ...interface{}) URL {
-	return URL{base, fmt.Sprintf(base, v...)}
-}
-
-func (url URL) String() string { return url.URL }