tweepy-self 1.2.1__py3-none-any.whl → 1.3.0__py3-none-any.whl

{tweepy_self-1.2.1.dist-info → tweepy_self-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tweepy-self
-Version: 1.2.1
+Version: 1.3.0
 Summary: Twitter (selfbot) for Python!
 Author: Alen
 Author-email: alen.kimov@gmail.com

{tweepy_self-1.2.1.dist-info → tweepy_self-1.3.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 twitter/__init__.py,sha256=hdrsdbH_qFhx6ro1ct79qF9SpkgFhxgbYUw9A4RVuec,684
-twitter/account.py,sha256=5y19GkinhpUC319w5cpOMV1Y06afSObVQMURgaWjneA,3320
+twitter/account.py,sha256=jneBaUSQ8dfHjOZFvs0qhVNg6EM6ChFIg6-Ee7DWXXM,3278
 twitter/base/__init__.py,sha256=x0EHKv4q_FI6xEq2nL4V9s8P6VWr6IaHTqdH9sXB5d8,133
 twitter/base/client.py,sha256=7byb0Psai-dvg_ww6Y7uyE2hV1pfTU653hFgVdRiqXo,478
 twitter/base/session.py,sha256=5aMjCytV_cu-uouccJzjMUPIgXZwMElPkqb7FCawmfg,2055
-twitter/client.py,sha256=1uhlNaB6_qKae0JyTvt_kWJQqHADzKSpKU7seiFsNsM,53016
-twitter/errors.py,sha256=U6kGyNp_5tEq-RwxLjm61muJLEp5BYBq9vrPBkCxr_g,4088
+twitter/client.py,sha256=WvwxVd273LjPtuyMPX69j42fJNxsK5nVFI4W4YACE1s,53674
+twitter/errors.py,sha256=2Co_XtXk9KwKVL89MyMIzRUT9Jaoy6hwzHxrokEOuAs,4122
 twitter/models.py,sha256=3-Lft160msCqOjRPubOmxMqWUkmjlTSzHSGsvZK91nU,1817
 twitter/utils/__init__.py,sha256=pyhQXwTdp0HFwV_UNF4dTyklLD9RtaefA16SrQXeNlg,589
 twitter/utils/file.py,sha256=-6n8I8KWDlntfciJJsfIeOi0gmqoHRIe1ldIx1ynGUE,1118
 twitter/utils/html.py,sha256=Cs55MxVyZLSKiCEj11ALUrnCW9ADZ4CEDCE0gKESzO0,1627
 twitter/utils/other.py,sha256=4NaGd2CIJVrDiW17shcrDlJRqFkQNbBSTiiH7kNWcww,559
-tweepy_self-1.2.1.dist-info/METADATA,sha256=IQTOzYa9xI3sozUwaM20A53int0AgWVfEkPsRnOHDGc,9139
-tweepy_self-1.2.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tweepy_self-1.2.1.dist-info/RECORD,,
+tweepy_self-1.3.0.dist-info/METADATA,sha256=a4Iwl5zvqRiA3lFSvY_3eLnoVPLVDNccmk9R3wNIuNM,9139
+tweepy_self-1.3.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+tweepy_self-1.3.0.dist-info/RECORD,,

twitter/account.py

@@ -21,14 +21,14 @@ class AccountStatus(enum.StrEnum):
 
 class Account(BaseModel):
     auth_token:  str | None = Field(default=None, pattern=r"^[a-f0-9]{40}$")
-    ct0:         str | None
-    id:          int | None
-    name:        str | None
-    username:    str | None
-    password:    str | None
-    email:       str | None
-    totp_secret: str | None = Field(default=None, pattern=r"^[a-f0-9]{12}$")
-    backup_code: str | None = Field(default=None, pattern=r"^[A-Z0-9]{16}$")
+    ct0:         str | None = None
+    id:          int | None = None
+    name:        str | None = None
+    username:    str | None = None
+    password:    str | None = None
+    email:       str | None = None
+    totp_secret: str | None = None
+    backup_code: str | None = None
     status: AccountStatus = AccountStatus.UNKNOWN
 
     @property

twitter/client.py

@@ -36,7 +36,7 @@ class Client(BaseClient):
         'authority': 'twitter.com',
         'origin': 'https://twitter.com',
         'x-twitter-active-user': 'yes',
-        # 'x-twitter-auth-type': 'OAuth2Session',
+        'x-twitter-auth-type': 'OAuth2Session',
         'x-twitter-client-language': 'en',
     }
     _GRAPHQL_URL = 'https://twitter.com/i/api/graphql'
@@ -73,11 +73,15 @@ class Client(BaseClient):
             account: Account,
             *,
             wait_on_rate_limit: bool = True,
+            capsolver_api_key: str = None,
+            max_unlock_attempts: int = 4,
             **session_kwargs,
     ):
         super().__init__(**session_kwargs)
         self.account = account
         self.wait_on_rate_limit = wait_on_rate_limit
+        self.capsolver_api_key = capsolver_api_key
+        self.max_unlock_attempts = max_unlock_attempts
 
     async def request(
             self,
@@ -148,7 +152,11 @@ class Client(BaseClient):
 
             if 326 in exc.api_codes:
                 self.account.status = AccountStatus.LOCKED
-                raise Locked(self.account)
+                if not self.capsolver_api_key:
+                    raise Locked(self.account)
+
+                await self.unlock()
+                return await self.request(method, url, auth, bearer, **kwargs)
 
             raise exc
 
@@ -170,7 +178,11 @@ class Client(BaseClient):
 
             if 326 in exc.api_codes:
                 self.account.status = AccountStatus.LOCKED
-                raise Locked(self.account)
+                if not self.capsolver_api_key:
+                    raise Locked(self.account)
+
+                await self.unlock()
+                return await self.request(method, url, auth, bearer, **kwargs)
 
             raise exc
 
@@ -722,6 +734,8 @@ class Client(BaseClient):
         is_updated = all(response_json.get(key) == value for key, value in data.items() if key != "url")
         if website: is_updated &= URL(website) == URL(response_json["entities"]["url"]["urls"][0]["expanded_url"])
         await self.establish_status()  # Изменение данных профиля часто замораживает аккаунт
+        await self.unlock()
+        await self.request_user_data()
         return is_updated
 
     async def establish_status(self):
@@ -888,11 +902,7 @@ class Client(BaseClient):
 
         return await self.request("POST", self._CAPTCHA_URL, data=payload, bearer=False)
 
-    async def unlock(
-            self,
-            capsolver_api_key: str,
-            attempts: int = 4):
-        await self.establish_status()
+    async def unlock(self):
         if not self.account.status == "LOCKED":
             return
 
@@ -901,7 +911,7 @@ class Client(BaseClient):
         attempt = 1
 
         funcaptcha = {
-            "api_key": capsolver_api_key,
+            "api_key": self.capsolver_api_key,
             "websiteURL": self._CAPTCHA_URL,
             "websitePublicKey": self._CAPTCHA_SITE_KEY,
         }
@@ -921,7 +931,7 @@ class Client(BaseClient):
             response, html = await self._confirm_unlock(authenticity_token, assignment_token,
                                                         verification_string=token)
 
-            if attempt > attempts or response.url == "https://twitter.com/?lang=en":
+            if attempt > self.max_unlock_attempts or response.url == "https://twitter.com/?lang=en":
                 await self.establish_status()
                 return
 
@@ -1034,10 +1044,6 @@ class Client(BaseClient):
         return await self._send_task(flow_token, subtask_inputs, auth=False)
 
     async def _viewer(self):
-        """
-        Здесь нужно забрать ct0
-        :return:
-        """
         url, query_id = self._action_to_url("Viewer")
         features = {
             'responsive_web_graphql_exclude_directive_enabled': True,
@@ -1066,6 +1072,8 @@ class Client(BaseClient):
         """
         url = 'https://twitter.com'
         response = await self._session.request("GET", url)
+        # TODO Если в сессии есть рабочий auth_token, то не вернет нужную страницу.
+        #   Поэтому нужно очищать сессию перед вызовом этого метода.
         guest_token = re.search(r'gt\s?=\s?\d+', response.text)[0].split('=')[1]
         return guest_token
 

twitter/errors.py

@@ -41,7 +41,7 @@ class BadToken(BadAccount):
 
 class Locked(BadAccount):
     def __init__(self, account: Account):
-        exception_message = f"Twitter account is locked. Captcha required to unlock."
+        exception_message = (f"Twitter account is locked. Paste CapSolver API key into Client instance to autounlock.")
         super().__init__(account, custom_exception_message=exception_message)