mirrors/apollo-backend
2
0
Fork 0
mirror of https://github.com/christianselig/apollo-backend synced 2024-11-22 19:57:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix rate limiting

Browse source
This commit is contained in:
Andre Medeiros 2022-03-12 12:58:07 -05:00
parent a1a098b448
commit 7a6955212b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
internal/reddit/client.go
View file

@ -168,7 +168,7 @@ func (rac *AuthenticatedClient) request(r *Request, rh ResponseHandler, empty in
bb, remaining, reset, err := rac.doRequest(r) bb, remaining, reset, err := rac.doRequest(r)
if remaining <= RequestRemainingBuffer { if remaining <= RequestRemainingBuffer {
rac.markRateLimited(time.Duration(reset) * time.Second) rac.markRateLimited(remaining, time.Duration(reset)*time.Second)
} }
if err != nil && r.retry { if err != nil && r.retry {
@ -218,22 +218,24 @@ func (rac *AuthenticatedClient) isRateLimited() (bool, error) {
} }
key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId) key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId)
res, err := rac.redis.Exists(context.Background(), key).Result() _, err := rac.redis.Get(context.Background(), key).Result()
if err != nil { if err == redis.Nil {
return false, nil
} else if err == nil {
return true, nil
} else {
return false, err return false, err
} }
return res > 0, nil
} }
func (rac *AuthenticatedClient) markRateLimited(duration time.Duration) error { func (rac *AuthenticatedClient) markRateLimited(remaining int, duration time.Duration) error {
if rac.redditId == SkipRateLimiting { if rac.redditId == SkipRateLimiting {
return ErrRequiresRedditId return ErrRequiresRedditId
} }
key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId) key := fmt.Sprintf("reddit:%s:ratelimited", rac.redditId)
_, err := rac.redis.SetEX(context.Background(), key, true, duration).Result() _, err := rac.redis.SetEX(context.Background(), key, remaining, duration).Result()
return err return err
} }