tweepy-self 1.10.0b6__tar.gz → 1.10.0b7__tar.gz

{tweepy_self-1.10.0b6 → tweepy_self-1.10.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tweepy-self
-Version: 1.10.0b6
+Version: 1.10.0b7
 Summary: Twitter (selfbot) for Python!
 Home-page: https://github.com/alenkimov/tweepy-self
 Author: Alen

{tweepy_self-1.10.0b6 → tweepy_self-1.10.0b7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tweepy-self"
-version = "1.10.0.b6"
+version = "1.10.0.b7"
 description = "Twitter (selfbot) for Python!"
 authors = ["Alen <alen.kimov@gmail.com>"]
 readme = "README.md"

{tweepy_self-1.10.0b6 → tweepy_self-1.10.0b7}/twitter/client.py

@@ -190,7 +190,6 @@ class Client(BaseHTTPClient):
                     raise Locked(exc, self.account)
                 raise exc
 
-            self.account.status = AccountStatus.GOOD
             return response, data
 
         if response.status_code == 400:
@@ -1184,6 +1183,7 @@ class Client(BaseHTTPClient):
         url = "https://twitter.com/i/api/1.1/account/update_profile.json"
         try:
             await self.request("POST", url, auto_unlock=False, auto_relogin=False)
+            self.account.status = AccountStatus.GOOD
         except BadAccount:
             pass
 
@@ -1422,6 +1422,11 @@ class Client(BaseHTTPClient):
 
         await self.establish_status()
 
+    async def update_backup_code(self):
+        url = "https://api.twitter.com/1.1/account/backup_code.json"
+        response, response_json = await self.request("GET", url)
+        self.account.backup_code = response_json["codes"][0]
+
     async def _task(self, **kwargs):
         """
         :return: flow_token, subtasks
@@ -1550,18 +1555,27 @@ class Client(BaseHTTPClient):
         ]
         return await self._send_task(flow_token, subtask_inputs, auth=False)
 
-    async def _login_two_factor_auth_challenge(self, flow_token):
-        if not self.account.totp_secret:
-            raise TwitterException(
-                f"Failed to login. Task id: LoginTwoFactorAuthChallenge"
-            )
-
+    async def _login_two_factor_auth_challenge(self, flow_token, value: str):
         subtask_inputs = [
             {
                 "subtask_id": "LoginTwoFactorAuthChallenge",
                 "enter_text": {
-                    "text": self.account.get_totp_code(),
+                    "text": value,
+                    "link": "next_link",
+                },
+            }
+        ]
+        return await self._send_task(flow_token, subtask_inputs, auth=False)
+
+    async def _login_two_factor_auth_choose_method(
+        self, flow_token: str, choices: Iterable[int] = (0,)
+    ):
+        subtask_inputs = [
+            {
+                "subtask_id": "LoginTwoFactorAuthChooseMethod",
+                "choice_selection": {
                     "link": "next_link",
+                    "selected_choices": [str(choice) for choice in choices],
                 },
             }
         ]
@@ -1601,7 +1615,9 @@ class Client(BaseHTTPClient):
         guest_token = re.search(r"gt\s?=\s?\d+", response.text)[0].split("=")[1]
         return guest_token
 
-    async def _login(self):
+    async def _login(self) -> bool:
+        update_backup_code = False
+
         guest_token = await self._request_guest_token()
         self._session.headers["X-Guest-Token"] = guest_token
 
@@ -1616,7 +1632,7 @@ class Client(BaseHTTPClient):
 
         if "LoginEnterAlternateIdentifierSubtask" in subtask_ids:
             if not self.account.username:
-                raise ValueError("No username to relogin")
+                raise TwitterException("Failed to login: no username to relogin")
 
         flow_token, subtasks = await self._login_enter_password(flow_token)
         flow_token, subtasks = await self._account_duplication_check(flow_token)
@@ -1628,11 +1644,50 @@ class Client(BaseHTTPClient):
             raise TwitterException(f"Failed to login: email verification!")
 
         if "LoginTwoFactorAuthChallenge" in subtask_ids:
-            flow_token, subtasks = await self._login_two_factor_auth_challenge(
-                flow_token
-            )
+            if not self.account.totp_secret:
+                raise TwitterException(
+                    f"Failed to login. Task id: LoginTwoFactorAuthChallenge. No totp_secret!"
+                )
+
+            try:
+                # fmt: off
+                flow_token, subtasks = await self._login_two_factor_auth_challenge(flow_token, self.account.get_totp_code())
+                # fmt: on
+            except HTTPException as exc:
+                if 399 in exc.api_codes:
+                    logger.warning(
+                        f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
+                        f" Bad TOTP secret!"
+                    )
+                    if not self.account.backup_code:
+                        raise TwitterException(
+                            f"Failed to login. Task id: LoginTwoFactorAuthChallenge. No backup code!"
+                        )
+
+                    # Enter backup code
+                    # fmt: off
+                    flow_token, subtasks = await self._login_two_factor_auth_choose_method(flow_token)
+                    try:
+                        flow_token, subtasks = await self._login_two_factor_auth_challenge(flow_token, self.account.backup_code)
+                    except HTTPException as exc:
+                        if 399 in exc.api_codes:
+                            logger.warning(
+                                f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
+                                f" Bad backup code!"
+                            )
+                            raise TwitterException(
+                                f"Failed to login. Task id: LoginTwoFactorAuthChallenge. Bad backup_code!"
+                            )
+                        else:
+                            raise
+
+                    update_backup_code = True
+                    # fmt: on
+                else:
+                    raise
 
         await self._finish_task(flow_token)
+        return update_backup_code
 
     async def relogin(self):
         """
@@ -1647,8 +1702,17 @@ class Client(BaseHTTPClient):
         if not self.account.password:
             raise ValueError("No password")
 
-        await self._login()
+        update_backup_code = await self._login()
         await self._viewer()
+
+        if update_backup_code:
+            await self.update_backup_code()
+            logger.warning(
+                f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
+                f" Requested new backup code!"
+            )
+            # TODO Также обновлять totp_secret
+
         await self.establish_status()
 
     async def login(self):