fix ratelimit parsing

Author: jonas747

ratelimit.go

@@ -231,12 +231,12 @@ func (b *Bucket) Release(headers http.Header, lockCounter int64) error {
 	retryAfter := headers.Get("Retry-After")
 	if retryAfter != "" {
 
-		parsedAfter, err := strconv.ParseInt(retryAfter, 10, 64)
+		dur, err := parseResetAfterDur(retryAfter)
 		if err != nil {
 			return err
 		}
 
-		resetAt := time.Now().Add(time.Duration(parsedAfter) * time.Second)
+		resetAt := time.Now().Add(dur)
 
 		// Lock either this single bucket or all buckets
 		global := headers.Get("X-RateLimit-Global")
@@ -246,12 +246,12 @@ func (b *Bucket) Release(headers http.Header, lockCounter int64) error {
 			b.reset = resetAt
 		}
 	} else if resetAfter != "" {
-		resetAfterParsed, err := strconv.ParseFloat(resetAfter, 64)
+		dur, err := parseResetAfterDur(resetAfter)
 		if err != nil {
 			return err
 		}
 
-		b.reset = time.Now().Add(time.Millisecond * time.Duration(resetAfterParsed*1000))
+		b.reset = time.Now().Add(dur)
 	}
 
 	// Udpate remaining if header is present
@@ -266,3 +266,12 @@ func (b *Bucket) Release(headers http.Header, lockCounter int64) error {
 
 	return nil
 }
+
+func parseResetAfterDur(in string) (time.Duration, error) {
+	resetAfterParsed, err := strconv.ParseFloat(in, 64)
+	if err != nil {
+		return 0, err
+	}
+
+	return time.Millisecond * time.Duration(resetAfterParsed*1000), nil
+}

restapi.go

@@ -168,10 +168,10 @@ func (s *Session) doRequest(method, urlStr, contentType string, b []byte, bucket
 
 		rl.Bucket = bucket.Key
 
-		s.log(LogInformational, "Rate Limiting %s, retry in %d", urlStr, rl.RetryAfter)
+		s.log(LogInformational, "Rate Limiting %s, retry in %s", urlStr, rl.RetryAfterDur())
 		s.handleEvent(rateLimitEventType, &RateLimit{TooManyRequests: &rl, URL: urlStr})
 
-		time.Sleep(rl.RetryAfter * time.Second)
+		time.Sleep(rl.RetryAfterDur())
 		// we can make the above smarter
 		// this method can cause longer delays than required
 		return nil, true, true, nil

structs.go

@@ -810,10 +810,14 @@ type Relationship struct {
 // A TooManyRequests struct holds information received from Discord
 // when receiving a HTTP 429 response.
 type TooManyRequests struct {
-	Bucket     string        `json:"bucket"`
-	Message    string        `json:"message"`
-	RetryAfter time.Duration `json:"retry_after"`
-	Global     bool          `json:"global"`
+	Bucket     string  `json:"bucket"`
+	Message    string  `json:"message"`
+	RetryAfter float64 `json:"retry_after"`
+	Global     bool    `json:"global"`
+}
+
+func (t *TooManyRequests) RetryAfterDur() time.Duration {
+	return time.Duration(t.RetryAfter*1000) * time.Millisecond
 }
 
 // A ReadState stores data on the read state of channels.