fix: display Twitter rate limit error (close #80)

y-young · Jul 12, 2023 · b764680 · b764680
1 parent 0bf3e4c
commit b764680
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/nazurin/sites/twitter/api/web.py b/nazurin/sites/twitter/api/web.py
@@ -141,8 +141,8 @@ async def _request(self, method, url, headers=None, **kwargs):
 
         async with Request(headers=headers, cookies=WebAPI.cookies) as request:
             async with request.request(method, url, **kwargs) as response:
-                result = await response.json()
                 if not response.ok:
+                    result = await response.text()
                     logger.error("Web API Error: {}, {}", response.status, result)
                     if response.status == 401:
                         raise NazurinError(
@@ -151,19 +151,27 @@ async def _request(self, method, url, headers=None, **kwargs):
                         )
                     if response.status == 429:
                         headers = response.headers
-                        logger.error(
-                            "Rate limited, limit: {}, reset: {}",
-                            headers[Headers.RATE_LIMIT_LIMIT],
-                            headers[Headers.RATE_LIMIT_RESET],
-                        )
-                        reset_time = datetime.fromtimestamp(
-                            headers[Headers.RATE_LIMIT_RESET]
-                        )
+                        detail = ""
+                        if (
+                            Headers.RATE_LIMIT_LIMIT in headers
+                            and Headers.RATE_LIMIT_RESET in headers
+                        ):
+                            rate_limit = int(headers[Headers.RATE_LIMIT_LIMIT])
+                            reset_time = int(headers[Headers.RATE_LIMIT_RESET])
+                            logger.error(
+                                "Rate limited, limit: {}, reset: {}",
+                                rate_limit,
+                                reset_time,
+                            )
+                            reset_time = datetime.fromtimestamp(reset_time)
+                            detail = (
+                                f"Rate limit: {rate_limit}, Reset time: {reset_time}"
+                            )
                         raise NazurinError(
-                            "Hit API rate limit, please try again later. "
-                            f"Reset time: {reset_time}"
+                            "Hit API rate limit, please try again later. " + detail
                         )
                     raise NazurinError(f"Twitter web API error: {result}")
+                result = await response.json()
                 self._update_cookies(response.cookies)
                 return result