handle cloudflare bans

Author: lovvskillz

discord_webhook/async_webhook.py

@@ -3,6 +3,7 @@
 import logging
 from contextlib import asynccontextmanager
 from functools import partial
+from http.client import HTTPException
 
 from . import DiscordWebhook
 
@@ -74,6 +75,8 @@ async def handle_rate_limit(self, response, request):
         """
         while response.status_code == 429:
             errors = response.json()
+            if not response.headers.get('Via'):
+                raise HTTPException(errors)
             wh_sleep = (int(errors['retry_after']) / 1000) + 0.15
             logger.error(
                 "Webhook rate limited: sleeping for {wh_sleep} seconds...".format(

discord_webhook/webhook.py

@@ -3,6 +3,7 @@
 import logging
 import time
 from functools import partial
+from http.client import HTTPException
 from typing import Any, Dict, List, Optional, Tuple, Union, cast
 
 import requests
@@ -409,6 +410,8 @@ def handle_rate_limit(self, response, request):
         """
         while response.status_code == 429:
             errors = json.loads(response.content.decode("utf-8"))
+            if not response.headers.get('Via'):
+                raise HTTPException(errors)
             wh_sleep = (int(errors["retry_after"]) / 1000) + 0.15
             logger.error(f"Webhook rate limited: sleeping for {wh_sleep} seconds...")
             time.sleep(wh_sleep)