diff --git a/config.toml b/config.toml index 61bc821..4e65382 100644 --- a/config.toml +++ b/config.toml @@ -2,7 +2,7 @@ refresh_token = "" [captcha_solver] -domain = "" +api_domain = "" api_key = "" [authorization.credentials] diff --git a/main.py b/main.py index 359a0aa..a429a95 100644 --- a/main.py +++ b/main.py @@ -170,7 +170,7 @@ async def main() -> None: ) captcha_solver_config = CaptchaSolverConfig( - domain=config["captcha_solver"]["domain"], + api_domain=config["captcha_solver"]["api_domain"], api_key=config["captcha_solver"]["api_key"], ) diff --git a/utils/passes_api.py b/utils/passes_api.py index 8e5d5da..f10ab96 100644 --- a/utils/passes_api.py +++ b/utils/passes_api.py @@ -271,15 +271,15 @@ async def _get_recaptcha_token( CaptchaError If the CAPTCHA solving service returns an error or is unsupported. """ - if captcha_solver_config.domain not in CAPTCHA_TASK_JSON: + if captcha_solver_config.api_domain not in CAPTCHA_TASK_JSON: raise CaptchaError("Unsupported CAPTCHA solving service.") create_task_response = await self._session.post( - f"https://{captcha_solver_config.domain}/createTask", + f"https://{captcha_solver_config.api_domain}/createTask", json={ "clientKey": captcha_solver_config.api_key, "task": { - **CAPTCHA_TASK_JSON[captcha_solver_config.domain], + **CAPTCHA_TASK_JSON[captcha_solver_config.api_domain], "websiteURL": "https://www.passes.com/login", "websiteKey": self.RECAPTCHA_SITEKEY, "pageAction": "login", @@ -297,7 +297,7 @@ async def _get_recaptcha_token( while True: task_result = await self._session.post( - f"https://{captcha_solver_config.domain}/getTaskResult", + f"https://{captcha_solver_config.api_domain}/getTaskResult", json={ "clientKey": captcha_solver_config.api_key, "taskId": task_json["taskId"], diff --git a/utils/utils.py b/utils/utils.py index 2a1f03f..dfd0d80 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -121,8 +121,8 @@ async def json(self) -> str: class CaptchaSolverConfig(BaseModel): """A class for representing the configuration for a CAPTCHA solving service.""" - domain: str + api_domain: str api_key: str def __bool__(self) -> bool: - return bool(self.domain and self.api_key) + return bool(self.api_domain and self.api_key)