tweepy-self 1.10.0b5__py3-none-any.whl → 1.10.0b7__py3-none-any.whl

{tweepy_self-1.10.0b5.dist-info → tweepy_self-1.10.0b7.dist-info}/METADATA

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

{tweepy_self-1.10.0b5.dist-info → tweepy_self-1.10.0b7.dist-info}/RECORD

@@ -10,7 +10,7 @@ twitter/account.py,sha256=joAB5Zw-Le5E3kOZ-1nb4DPGlTqWYv2Vs6gJ3cwu7is,3175
 twitter/base/__init__.py,sha256=Q2ko0HeOS5tiBnDVKxxaZYetwRR3YXJ67ujL3oThGd4,141
 twitter/base/client.py,sha256=J_iL4ZGfwTbZ2gpjtFCbBxNgt7weJ55EeMGzYsLtjf4,500
 twitter/base/session.py,sha256=JFPS-9Qae1iY3NfNcywxvWWmRDijaU_Rjs3WaQ00iFA,2071
-twitter/client.py,sha256=p5opgzbjmG8kD52BwLELVokXHFC_CQwtKeOUfJcPuMo,69935
+twitter/client.py,sha256=69QQb-ZnbjqpIhhozxsboruuy3MeJDUGM7nPEH-cBdg,73559
 twitter/enums.py,sha256=-OH6Ibxarq5qt4E2AhkProVawcEyIf5YG_h_G5xiV9Y,270
 twitter/errors.py,sha256=oNa0Neos80ZK4-0FBzqgxXonH564qFnoN-kavHalfR4,5274
 twitter/models.py,sha256=7yObMPUUEwJEbraHzFwmUKd91UhR2-zyfJTm4xIqrSQ,4834
@@ -18,6 +18,6 @@ twitter/utils/__init__.py,sha256=usxpfcRQ7zxTTgZ-i425tT7hIz73Pwh9FDj4t6O3dYg,663
 twitter/utils/file.py,sha256=Sz2KEF9DnL04aOP1XabuMYMMF4VR8dJ_KWMEVvQ666Y,1120
 twitter/utils/html.py,sha256=nrOJw0vUKfBaHgFaQSQIdXfvfZ8mdu84MU_s46kJTJ4,2087
 twitter/utils/other.py,sha256=9RIYF2AMdmNKIwClG3jBP7zlvxZPEgYfuHaIiOhURzM,1061
-tweepy_self-1.10.0b5.dist-info/METADATA,sha256=y0MCWG3yt9HC5rjqFDI5w3VAMJ9iu3oIsFdfhE8kEaM,13153
-tweepy_self-1.10.0b5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tweepy_self-1.10.0b5.dist-info/RECORD,,
+tweepy_self-1.10.0b7.dist-info/METADATA,sha256=NpC2w-frRkmdX851z52xcAnsXX33NJ49pNuo21TIFUY,13153
+tweepy_self-1.10.0b7.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+tweepy_self-1.10.0b7.dist-info/RECORD,,

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:
@@ -296,6 +295,7 @@ class Client(BaseHTTPClient):
     async def on_startup(self):
         if self._update_account_info_on_startup:
             await self.update_account_info()
+            await self.establish_status()
 
     async def _request_oauth2_auth_code(
         self,
@@ -1183,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
 
@@ -1421,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
@@ -1516,8 +1522,8 @@ class Client(BaseHTTPClient):
                             "key": "user_identifier",
                             "response_data": {
                                 "text_data": {
-                                    "result": self.account.email
-                                    or self.account.username
+                                    "result": self.account.username
+                                    or self.account.email
                                 }
                             },
                         }
@@ -1549,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],
                 },
             }
         ]
@@ -1600,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
 
@@ -1610,6 +1627,13 @@ class Client(BaseHTTPClient):
         flow_token, subtasks = await self._request_login_tasks()
         for _ in range(2):
             flow_token, subtasks = await self._login_enter_user_identifier(flow_token)
+
+        subtask_ids = [subtask["subtask_id"] for subtask in subtasks]
+
+        if "LoginEnterAlternateIdentifierSubtask" in subtask_ids:
+            if not self.account.username:
+                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)
 
@@ -1620,21 +1644,75 @@ 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):
+        """
+        Может вызвать следующую ошибку:
+            twitter.errors.BadRequest: (response status: 400)
+            (code 398) Can't complete your signup right now.
+        Причина возникновения ошибки неизвестна. Не забудьте обработать ее.
+        """
         if not self.account.email and not self.account.username:
             raise ValueError("No email or username")
 
         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):