From 4d9fd1a6f84dceefe3b49daece56f1dbaeac56cb Mon Sep 17 00:00:00 2001 From: Zed Date: Thu, 6 Jan 2022 00:19:09 +0100 Subject: [PATCH] Use int for token reset instead of Time --- src/tokens.nim | 10 ++-------- src/types.nim | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/tokens.nim b/src/tokens.nim index 96f7dbd..a9a7831 100644 --- a/src/tokens.nim +++ b/src/tokens.nim @@ -26,11 +26,7 @@ proc getPoolJson*: string = } for api in token.apis.keys: - list[token.tok]["apis"][$api] = %*{ - "remaining": token.apis[api].remaining, - "reset": $token.apis[api].reset - } - + list[token.tok]["apis"][$api] = %token.apis[api] return $list proc rateLimitError*(): ref RateLimitError = @@ -71,7 +67,7 @@ proc isLimited(token: Token; api: Api): bool = if api in token.apis: let limit = token.apis[api] - return (limit.remaining <= 10 and limit.reset > getTime()) + return (limit.remaining <= 10 and limit.reset > epochTime().int) else: return false @@ -104,8 +100,6 @@ proc getToken*(api: Api): Future[Token] {.async.} = raise rateLimitError() proc setRateLimit*(token: Token; api: Api; remaining, reset: int) = - let reset = fromUnix(reset) - # avoid undefined behavior in race conditions if api in token.apis: let limit = token.apis[api] diff --git a/src/types.nim b/src/types.nim index d14bf6b..e8cdb7d 100644 --- a/src/types.nim +++ b/src/types.nim @@ -20,7 +20,7 @@ type RateLimit* = object remaining*: int - reset*: Time + reset*: int Token* = ref object tok*: string