Merge branch 'master' into refactor/rnet

Author: dolfies

discord/errors.py

@@ -249,6 +249,8 @@ class CaptchaRequired(HTTPException):
         The CAPTCHA service to use. Usually ``hcaptcha``.
 
         .. versionadded:: 2.1
+    session_id: Optional[:class:`str`]
+        The CAPTCHA session ID.
     rqdata: Optional[:class:`str`]
         The enterprise hCaptcha request data.
 
@@ -267,6 +269,7 @@ class CaptchaRequired(HTTPException):
         'errors',
         'service',
         '_sitekey',
+        'session_id',
         'rqdata',
         'rqtoken',
         'should_serve_invisible',
@@ -281,6 +284,7 @@ def __init__(self, response: _ResponseType, message: CaptchaPayload):
         self.errors: List[str] = message['captcha_key']
         self.service: CaptchaService = message.get('captcha_service', 'recaptcha')
         self._sitekey: str | None = message.get('captcha_sitekey')
+        self.session_id: Optional[str] = message.get('captcha_session_id')
         self.rqdata: Optional[str] = message.get('captcha_rqdata')
         self.rqtoken: Optional[str] = message.get('captcha_rqtoken')
         self.should_serve_invisible: bool = message.get('should_serve_invisible', False)

discord/http.py

@@ -1014,11 +1014,13 @@ async def request(
                 except CaptchaRequired as e:
                     # The way captcha handling works is completely transparent
                     # The user is expected to provide a handler that will be called to return a solution
-                    # Then, we just insert the solution + rqtoken (if applicable) into the headers and retry the request
+                    # Then, we just insert the solution + session into the headers and retry the request
                     if captcha_handler is None or tries == 4:
                         raise
                     else:
                         headers['X-Captcha-Key'] = await captcha_handler(e)
+                        if e.session_id:
+                            headers['X-Captcha-Session-Id'] = e.session_id
                         if e.rqtoken:
                             headers['X-Captcha-Rqtoken'] = e.rqtoken
 

discord/types/error.py

@@ -53,6 +53,7 @@ class CaptchaRequired(TypedDict):
     captcha_key: List[str]
     captcha_service: NotRequired[CaptchaService]
     captcha_sitekey: Optional[str]
+    captcha_session_id: NotRequired[str]
     captcha_rqdata: NotRequired[str]
     captcha_rqtoken: NotRequired[str]
     should_serve_invisible: NotRequired[bool]