tweepy-self 1.10.0b1__tar.gz → 1.10.0b3__tar.gz

{tweepy_self-1.10.0b1 → tweepy_self-1.10.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tweepy-self
-Version: 1.10.0b1
+Version: 1.10.0b3
 Summary: Twitter (selfbot) for Python!
 Home-page: https://github.com/alenkimov/tweepy-self
 Author: Alen
@@ -15,7 +15,7 @@ Requires-Dist: better-proxy (>=1.1,<2.0)
 Requires-Dist: curl_cffi (==0.6.2)
 Requires-Dist: loguru (>=0.7,<0.8)
 Requires-Dist: lxml (>=5,<6)
-Requires-Dist: pydantic (>=1)
+Requires-Dist: pydantic (>=2)
 Requires-Dist: pyotp (>=2,<3)
 Requires-Dist: requests (>=2,<3)
 Requires-Dist: tenacity (>=8,<9)

{tweepy_self-1.10.0b1 → tweepy_self-1.10.0b3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tweepy-self"
-version = "1.10.0.b1"
+version = "1.10.0.b3"
 description = "Twitter (selfbot) for Python!"
 authors = ["Alen <alen.kimov@gmail.com>"]
 readme = "README.md"
@@ -15,7 +15,7 @@ python = "^3.11"
 curl_cffi = "0.6.2"
 better-proxy = "^1.1"
 beautifulsoup4 = "^4"
-pydantic = ">=1"
+pydantic = ">=2"
 lxml = "^5"
 pyotp = "^2"
 yarl = "^1"

{tweepy_self-1.10.0b1 → tweepy_self-1.10.0b3}/twitter/client.py

@@ -52,7 +52,7 @@ class Client(BaseHTTPClient):
         "CreateRetweet": "ojPdsZsimiJrUGLR1sjUtA",
         "FavoriteTweet": "lI07N6Otwv1PhnEgXILM7A",
         "UnfavoriteTweet": "ZYKSe-w7KEslx3JhSIk5LA",
-        "CreateTweet": "SoVnbfCycZ7fERGCwpZkYA",
+        "CreateTweet": "v0en1yVV-Ybeek8ClmXwYw",
         "TweetResultByRestId": "V3vfsYzNEyD9tsf4xoFRgw",
         "ModerateTweet": "p'jF:GVqCjTcZol0xcBJjw",
         "DeleteTweet": "VaenaVgh5q5ih7kvyVjgtg",
@@ -159,7 +159,7 @@ class Client(BaseHTTPClient):
         auth_token = self._session.cookies.get("auth_token")
         if auth_token and auth_token != self.account.auth_token:
             self.account.auth_token = auth_token
-            logger.info(
+            logger.warning(
                 f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
                 f" Requested new auth_token!"
             )
@@ -239,7 +239,7 @@ class Client(BaseHTTPClient):
             reset_time = int(response.headers["x-rate-limit-reset"])
             sleep_time = reset_time - int(time()) + 1
             if sleep_time > 0:
-                logger.info(
+                logger.warning(
                     f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
                     f"Rate limited! Sleep time: {sleep_time} sec."
                 )
@@ -290,7 +290,7 @@ class Client(BaseHTTPClient):
 
         except Forbidden as exc:
             if 353 in exc.api_codes and "ct0" in exc.response.cookies:
-                return await self._request(method, url, **kwargs)
+                return await self.request(method, url, **kwargs)
             else:
                 raise
 
@@ -426,7 +426,7 @@ class Client(BaseHTTPClient):
         response, response_json = await self.request("POST", url)
         self.account.username = response_json["screen_name"]
 
-    async def _request_user(self, username: str) -> User:
+    async def _request_user(self, username: str) -> User | None:
         url, query_id = self._action_to_url("UserByScreenName")
         username = remove_at_sign(username)
         variables = {
@@ -454,26 +454,39 @@ class Client(BaseHTTPClient):
             "fieldToggles": to_json(field_toggles),
         }
         response, data = await self.request("GET", url, params=params)
+        if not data["data"]:
+            return None
         return User.from_raw_data(data["data"]["user"]["result"])
 
     async def request_user(
         self, *, username: str = None, user_id: int | str = None
-    ) -> User | Account:
+    ) -> User | Account | None:
+        """
+        Возвращает None, если задано несуществующее имя пользователя
+        """
         if username and user_id:
             raise ValueError("Specify username or user_id, not both.")
 
         if user_id:
             users = await self.request_users((user_id,))
             user = users[user_id]
+        elif username:
+            user = await self._request_user(username)
         else:
-            if not username:
-                if not self.account.username:
-                    await self.request_and_set_username()
-                username = self.account.username
+            if not self.account.username:
+                await self.request_and_set_username()
 
-            user = await self._request_user(username)
+            user = await self._request_user(self.account.username)
+
+            if not user:
+                bad_username = self.account.username
+                await self.request_and_set_username()
+                user = await self._request_user(self.account.username)
+                logger.warning(
+                    f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
+                    f" Bad username: {bad_username}. Requested a real username."
+                )
 
-        if self.account.username == user.username:
             self.account.update(**user.model_dump())
             user = self.account
 
@@ -606,6 +619,8 @@ class Client(BaseHTTPClient):
         """
         Repost (retweet)
 
+        Иногда может вернуть ошибку 404 (Not Found), если плохой прокси или по другим неизвестным причинам
+
         :return: Tweet
         """
         return await self._repost_or_search_duplicate(
@@ -613,9 +628,18 @@ class Client(BaseHTTPClient):
         )
 
     async def like(self, tweet_id: int) -> bool:
-        response_json = await self._interact_with_tweet("FavoriteTweet", tweet_id)
-        is_liked = response_json["data"]["favorite_tweet"] == "Done"
-        return is_liked
+        """
+        :return: Liked or not
+        """
+        try:
+            response_json = await self._interact_with_tweet("FavoriteTweet", tweet_id)
+        except HTTPException as exc:
+            if 139 in exc.api_codes:
+                # Already liked
+                return True
+            else:
+                raise
+        return response_json["data"]["favorite_tweet"] == "Done"
 
     async def unlike(self, tweet_id: int) -> dict:
         response_json = await self._interact_with_tweet("UnfavoriteTweet", tweet_id)
@@ -662,47 +686,50 @@ class Client(BaseHTTPClient):
         attachment_url: str = None,
     ) -> Tweet:
         url, query_id = self._action_to_url("CreateTweet")
-        payload = {
-            "variables": {
-                "tweet_text": text if text is not None else "",
-                "dark_request": False,
-                "media": {"media_entities": [], "possibly_sensitive": False},
-                "semantic_annotation_ids": [],
-            },
-            "features": {
-                "tweetypie_unmention_optimization_enabled": True,
-                "responsive_web_edit_tweet_api_enabled": True,
-                "graphql_is_translatable_rweb_tweet_is_translatable_enabled": True,
-                "view_counts_everywhere_api_enabled": True,
-                "longform_notetweets_consumption_enabled": True,
-                "tweet_awards_web_tipping_enabled": False,
-                "longform_notetweets_rich_text_read_enabled": True,
-                "longform_notetweets_inline_media_enabled": True,
-                "responsive_web_graphql_exclude_directive_enabled": True,
-                "verified_phone_label_enabled": False,
-                "freedom_of_speech_not_reach_fetch_enabled": True,
-                "standardized_nudges_misinfo": True,
-                "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": False,
-                "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False,
-                "responsive_web_graphql_timeline_navigation_enabled": True,
-                "responsive_web_enhance_cards_enabled": False,
-                "responsive_web_twitter_article_tweet_consumption_enabled": False,
-                "responsive_web_media_download_video_enabled": False,
-            },
-            "queryId": query_id,
+        variables = {
+            "tweet_text": text if text is not None else "",
+            "dark_request": False,
+            "media": {"media_entities": [], "possibly_sensitive": False},
+            "semantic_annotation_ids": [],
         }
         if attachment_url:
-            payload["variables"]["attachment_url"] = attachment_url
+            variables["attachment_url"] = attachment_url
         if tweet_id_to_reply:
-            payload["variables"]["reply"] = {
+            variables["reply"] = {
                 "in_reply_to_tweet_id": str(tweet_id_to_reply),
                 "exclude_reply_user_ids": [],
             }
         if media_id:
-            payload["variables"]["media"]["media_entities"].append(
+            variables["media"]["media_entities"].append(
                 {"media_id": str(media_id), "tagged_users": []}
             )
-
+        features = {
+            "communities_web_enable_tweet_community_results_fetch": True,
+            "c9s_tweet_anatomy_moderator_badge_enabled": True,
+            "tweetypie_unmention_optimization_enabled": True,
+            "responsive_web_edit_tweet_api_enabled": True,
+            "graphql_is_translatable_rweb_tweet_is_translatable_enabled": True,
+            "view_counts_everywhere_api_enabled": True,
+            "longform_notetweets_consumption_enabled": True,
+            "responsive_web_twitter_article_tweet_consumption_enabled": True,
+            "tweet_awards_web_tipping_enabled": False,
+            "longform_notetweets_rich_text_read_enabled": True,
+            "longform_notetweets_inline_media_enabled": True,
+            "rweb_video_timestamps_enabled": True,
+            "responsive_web_graphql_exclude_directive_enabled": True,
+            "verified_phone_label_enabled": False,
+            "freedom_of_speech_not_reach_fetch_enabled": True,
+            "standardized_nudges_misinfo": True,
+            "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": True,
+            "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False,
+            "responsive_web_graphql_timeline_navigation_enabled": True,
+            "responsive_web_enhance_cards_enabled": False,
+        }
+        payload = {
+            "variables": variables,
+            "features": features,
+            "queryId": query_id,
+        }
         response, response_json = await self.request("POST", url, json=payload)
         tweet = Tweet.from_raw_data(
             response_json["data"]["create_tweet"]["tweet_results"]["result"]
@@ -754,6 +781,11 @@ class Client(BaseHTTPClient):
         media_id: int | str = None,
         search_duplicate: bool = True,
     ) -> Tweet:
+        """
+        Иногда может вернуть ошибку 404 (Not Found), если плохой прокси или по другим неизвестным причинам
+
+        :return: Tweet
+        """
         return await self._tweet_or_search_duplicate(
             text,
             media_id=media_id,
@@ -768,6 +800,11 @@ class Client(BaseHTTPClient):
         media_id: int | str = None,
         search_duplicate: bool = True,
     ) -> Tweet:
+        """
+        Иногда может вернуть ошибку 404 (Not Found), если плохой прокси или по другим неизвестным причинам
+
+        :return: Tweet
+        """
         return await self._tweet_or_search_duplicate(
             text,
             media_id=media_id,
@@ -783,6 +820,11 @@ class Client(BaseHTTPClient):
         media_id: int | str = None,
         search_duplicate: bool = True,
     ) -> Tweet:
+        """
+        Иногда может вернуть ошибку 404 (Not Found), если плохой прокси или по другим неизвестным причинам
+
+        :return: Tweet
+        """
         return await self._tweet_or_search_duplicate(
             text,
             media_id=media_id,