Handle cloudflare bans on webhook requests

Fixes #5221
Rapptz · Sep 10, 2020 · e6017a2 · e6017a2
1 parent 425bb80
commit e6017a2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/discord/webhook.py b/discord/webhook.py
@@ -222,6 +222,10 @@ async def request(self, verb, url, payload=None, multipart=None, *, files=None,
 
                 # we are being rate limited
                 if r.status == 429:
+                    if not r.headers.get('Via'):
+                        # Banned by Cloudflare more than likely.
+                        raise HTTPException(r, data)
+
                     retry_after = response['retry_after'] / 1000.0
                     log.warning('Webhook ID %s is rate limited. Retrying in %.2f seconds', _id, retry_after)
                     await asyncio.sleep(retry_after)
@@ -317,6 +321,10 @@ def request(self, verb, url, payload=None, multipart=None, *, files=None, reason
             # we are being rate limited
             if r.status == 429:
                 if self.sleep:
+                    if not r.headers.get('Via'):
+                        # Banned by Cloudflare more than likely.
+                        raise HTTPException(r, data)
+
                     retry_after = response['retry_after'] / 1000.0
                     log.warning('Webhook ID %s is rate limited. Retrying in %.2f seconds', _id, retry_after)
                     time.sleep(retry_after)