tweepy-self 1.10.0b9__tar.gz → 1.11.1__tar.gz

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tweepy-self
-Version: 1.10.0b9
+Version: 1.11.1
 Summary: Twitter (selfbot) for Python!
 Home-page: https://github.com/alenkimov/tweepy-self
 Author: Alen
@@ -32,12 +32,19 @@ Description-Content-Type: text/markdown
 
 A modern, easy to use, feature-rich, and async ready API wrapper for Twitter's user API written in Python.
 
+_NEW!_ Менеджер аккаунтов с базой данных:
+- [tweepy-manager](https://github.com/alenkimov/tweepy-manager)
+
 More libraries of the family:
 - [better-proxy](https://github.com/alenkimov/better_proxy)
 - [better-web3](https://github.com/alenkimov/better_web3)
 
 Отдельное спасибо [Кузнице Ботов](https://t.me/bots_forge) за код для авторизации и разморозки! Подписывайтесь на их Telegram :)
 
+Похожие библиотеки:
+- [twikit (sync and async)](https://github.com/d60/twikit)
+- [twitter-api-client (sync)](https://github.com/trevorhobenshield/twitter-api-client)
+
 ## Key Features
 - Modern Pythonic API using async and await.
 - Prevents user account automation detection.
@@ -84,7 +91,9 @@ logger.enable("twitter")
 `level="DEBUG"` позволяет увидеть информацию обо всех запросах.
 
 ### Аккаунт
-После любого взаимодействия с Twitter устанавливается статус аккаунта:
+`twitter.Account`
+
+#### Статусы аккаунта
 - `UNKNOWN` - Статус аккаунта не установлен. Это статус по умолчанию.
 - `BAD_TOKEN` - Неверный или мертвый токен.
 - `SUSPENDED` - Действие учетной записи приостановлено. Тем не менее возможен запрос данных, а также авторизация через OAuth и OAuth2.
@@ -92,18 +101,23 @@ logger.enable("twitter")
 - `CONSENT_LOCKED` - Учетная запись заморожена (лок). Условия для разморозки неизвестны.
 - `GOOD` - Аккаунт в порядке.
 
+Метод `Client.establish_status()` устанавливает статус аккаунта.
+Также статус аккаунта может изменить любое взаимодействие с Twitter.
+Поэтому, во время работы может внезапно быть вызвано исключение семейства `twitter.errors.BadAccount`.
+
 Не каждое взаимодействие с Twitter достоверно определяет статус аккаунта.
-Например, простой запрос данных об аккаунте честно вернет данные, даже если действие вашей учетной записи приостановлено.
+Например, простой запрос данных об аккаунте честно вернет данные и не изменит статус, даже если действие вашей учетной записи приостановлено (`SUSPENDED`).
 
-Для достоверной установки статуса аккаунта используйте метод `Client.establish_status()`
+### Клиент
+`twitter.Client`
 
-### Настройка клиента
-Класс `twitter.Client` может быть сконфигурирован перед работой. Он принимает в себя следующие параметры:
+#### Настройка
+Клиент может быть сконфигурирован перед работой. Он принимает в себя следующие параметры:
 - `wait_on_rate_limit` Если включено, то при достижении Rate Limit будет ждать, вместо того, чтобы выбрасывать исключение. Включено по умолчанию.
 - `capsolver_api_key` API ключ сервиса [CapSolver](https://dashboard.capsolver.com/passport/register?inviteCode=m-aE3NeBGZLU). Нужен для автоматической разморозки аккаунта.
 - `max_unlock_attempts` Максимальное количество попыток разморозки аккаунта. По умолчанию: 5.
 - `auto_relogin` Если включено, то при невалидном токене (`BAD_TOKEN`) и предоставленных данных для авторизации (имя пользователя, пароль и totp_secret) будет произведен автоматический релогин (замена токена). Включено по умолчанию.
-- `update_account_info_on_startup` Если включено, то на старте будет автоматически запрошена информация об аккаунте. Включено по умолчанию.
+- `update_account_info_on_startup` Если включено, то на старте будет автоматически запрошена информация об аккаунте, а также установлен его статус. Включено по умолчанию.
 - `**session_kwargs` Любые параметры, которые может принимать сессия `curl_cffi.requests.AsyncSession`. Например, можно передать параметр `proxy`.
 
 Пример настройки клиента:

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/README.md

@@ -6,12 +6,19 @@
 
 A modern, easy to use, feature-rich, and async ready API wrapper for Twitter's user API written in Python.
 
+_NEW!_ Менеджер аккаунтов с базой данных:
+- [tweepy-manager](https://github.com/alenkimov/tweepy-manager)
+
 More libraries of the family:
 - [better-proxy](https://github.com/alenkimov/better_proxy)
 - [better-web3](https://github.com/alenkimov/better_web3)
 
 Отдельное спасибо [Кузнице Ботов](https://t.me/bots_forge) за код для авторизации и разморозки! Подписывайтесь на их Telegram :)
 
+Похожие библиотеки:
+- [twikit (sync and async)](https://github.com/d60/twikit)
+- [twitter-api-client (sync)](https://github.com/trevorhobenshield/twitter-api-client)
+
 ## Key Features
 - Modern Pythonic API using async and await.
 - Prevents user account automation detection.
@@ -58,7 +65,9 @@ logger.enable("twitter")
 `level="DEBUG"` позволяет увидеть информацию обо всех запросах.
 
 ### Аккаунт
-После любого взаимодействия с Twitter устанавливается статус аккаунта:
+`twitter.Account`
+
+#### Статусы аккаунта
 - `UNKNOWN` - Статус аккаунта не установлен. Это статус по умолчанию.
 - `BAD_TOKEN` - Неверный или мертвый токен.
 - `SUSPENDED` - Действие учетной записи приостановлено. Тем не менее возможен запрос данных, а также авторизация через OAuth и OAuth2.
@@ -66,18 +75,23 @@ logger.enable("twitter")
 - `CONSENT_LOCKED` - Учетная запись заморожена (лок). Условия для разморозки неизвестны.
 - `GOOD` - Аккаунт в порядке.
 
+Метод `Client.establish_status()` устанавливает статус аккаунта.
+Также статус аккаунта может изменить любое взаимодействие с Twitter.
+Поэтому, во время работы может внезапно быть вызвано исключение семейства `twitter.errors.BadAccount`.
+
 Не каждое взаимодействие с Twitter достоверно определяет статус аккаунта.
-Например, простой запрос данных об аккаунте честно вернет данные, даже если действие вашей учетной записи приостановлено.
+Например, простой запрос данных об аккаунте честно вернет данные и не изменит статус, даже если действие вашей учетной записи приостановлено (`SUSPENDED`).
 
-Для достоверной установки статуса аккаунта используйте метод `Client.establish_status()`
+### Клиент
+`twitter.Client`
 
-### Настройка клиента
-Класс `twitter.Client` может быть сконфигурирован перед работой. Он принимает в себя следующие параметры:
+#### Настройка
+Клиент может быть сконфигурирован перед работой. Он принимает в себя следующие параметры:
 - `wait_on_rate_limit` Если включено, то при достижении Rate Limit будет ждать, вместо того, чтобы выбрасывать исключение. Включено по умолчанию.
 - `capsolver_api_key` API ключ сервиса [CapSolver](https://dashboard.capsolver.com/passport/register?inviteCode=m-aE3NeBGZLU). Нужен для автоматической разморозки аккаунта.
 - `max_unlock_attempts` Максимальное количество попыток разморозки аккаунта. По умолчанию: 5.
 - `auto_relogin` Если включено, то при невалидном токене (`BAD_TOKEN`) и предоставленных данных для авторизации (имя пользователя, пароль и totp_secret) будет произведен автоматический релогин (замена токена). Включено по умолчанию.
-- `update_account_info_on_startup` Если включено, то на старте будет автоматически запрошена информация об аккаунте. Включено по умолчанию.
+- `update_account_info_on_startup` Если включено, то на старте будет автоматически запрошена информация об аккаунте, а также установлен его статус. Включено по умолчанию.
 - `**session_kwargs` Любые параметры, которые может принимать сессия `curl_cffi.requests.AsyncSession`. Например, можно передать параметр `proxy`.
 
 Пример настройки клиента:

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/pyproject.toml

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

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/__init__.py

@@ -2,7 +2,7 @@
 Twitter API Wrapper
 ~~~~~~~~~~~~~~~~~~~
 
-A basic wrapper for the Twitter user API.
+A Python library for interacting with the Twitter API.
 """
 
 from .client import Client

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/account.py

@@ -50,7 +50,7 @@ class Account(User):
 
     def get_totp_code(self) -> str | None:
         if not self.totp_secret:
-            raise ValueError("No key2fa")
+            raise ValueError("No totp_secret")
 
         return str(pyotp.TOTP(self.totp_secret).now())
 

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/base/session.py

@@ -14,13 +14,14 @@ class BaseAsyncSession(requests.AsyncSession):
     DEFAULT_HEADERS = {
         "accept": "*/*",
         "accept-language": "en-US,en",
-        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-        "sec-ch-ua": '"Not_A Brand";v="8", "Chromium";v="120", "Google Chrome";v="120"',
+        "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
+        'Priority': 'u=1, i',
+        "sec-ch-ua": '"Google Chrome";v="125", "Chromium";v="125", "Not.A/Brand";v="24"',
         "sec-ch-ua-platform": '"Windows"',
         "sec-ch-ua-mobile": "?0",
         "sec-fetch-dest": "empty",
         "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-origin",
+        "sec-fetch-site": "ssame-site",
         "connection": "keep-alive",
     }
     DEFAULT_IMPERSONATE = requests.BrowserType.chrome120

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/client.py

@@ -22,12 +22,12 @@ from .errors import (
     RateLimited,
     ServerError,
     BadAccount,
-    BadToken,
-    Locked,
-    ConsentLocked,
-    Suspended,
+    BadAccountToken,
+    AccountLocked,
+    AccountConsentLocked,
+    AccountSuspended,
+    AccountNotFound,
 )
-from .utils import to_json
 from .base import BaseHTTPClient
 from .account import Account, AccountStatus
 from .models import User, Tweet, Media, Subtask
@@ -41,17 +41,17 @@ from .utils import (
 class Client(BaseHTTPClient):
     _BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
     _DEFAULT_HEADERS = {
-        "authority": "twitter.com",
-        "origin": "https://twitter.com",
+        "authority": "x.com",
+        "origin": "https://x.com",
         "x-twitter-active-user": "yes",
         "x-twitter-client-language": "en",
     }
-    _GRAPHQL_URL = "https://twitter.com/i/api/graphql"
+    _GRAPHQL_URL = "https://x.com/i/api/graphql"
     _ACTION_TO_QUERY_ID = {
         "CreateRetweet": "ojPdsZsimiJrUGLR1sjUtA",
         "FavoriteTweet": "lI07N6Otwv1PhnEgXILM7A",
         "UnfavoriteTweet": "ZYKSe-w7KEslx3JhSIk5LA",
-        "CreateTweet": "v0en1yVV-Ybeek8ClmXwYw",
+        "CreateTweet": "oB-5XsHNAbjvARJEc8CZFw",
         "TweetResultByRestId": "V3vfsYzNEyD9tsf4xoFRgw",
         "ModerateTweet": "p'jF:GVqCjTcZol0xcBJjw",
         "DeleteTweet": "VaenaVgh5q5ih7kvyVjgtg",
@@ -62,9 +62,9 @@ class Client(BaseHTTPClient):
         "Followers": "3yX7xr2hKjcZYnXt6cU6lQ",
         "UserByScreenName": "G3KGOASz96M-Qu0nwmGXNg",
         "UsersByRestIds": "itEhGywpgX9b3GJCzOtSrA",
-        "Viewer": "W62NnYgkgziw9bwyoVht0g",
+        "Viewer": "-876iyxD1O_0X0BqeykjZA",
     }
-    _CAPTCHA_URL = "https://twitter.com/account/access"
+    _CAPTCHA_URL = "https://x.com/account/access"
     _CAPTCHA_SITE_KEY = "0152B4EB-D2DC-460A-89A1-629838B529C9"
 
     @classmethod
@@ -95,6 +95,8 @@ class Client(BaseHTTPClient):
         self.auto_relogin = auto_relogin
         self._update_account_info_on_startup = update_account_info_on_startup
 
+        self.gql = GQLClient(self)
+
     async def __aenter__(self):
         await self.on_startup()
         return await super().__aenter__()
@@ -109,21 +111,25 @@ class Client(BaseHTTPClient):
         wait_on_rate_limit: bool = None,
         **kwargs,
     ) -> tuple[requests.Response, Any]:
-        cookies = kwargs["cookies"] = kwargs.get("cookies") or {}
-        headers = kwargs["headers"] = kwargs.get("headers") or {}
-
+        cookies = kwargs["cookies"] = kwargs.get("cookies", {})
+        headers = kwargs["headers"] = kwargs.get("headers", {})
         if bearer:
             headers["authorization"] = f"Bearer {self._BEARER_TOKEN}"
-            # headers["x-twitter-auth-type"] = "OAuth2Session"
 
         if auth:
             if not self.account.auth_token:
                 raise ValueError("No auth_token. Login before")
 
             cookies["auth_token"] = self.account.auth_token
+            headers["x-twitter-auth-type"] = "OAuth2Session"
             if self.account.ct0:
                 cookies["ct0"] = self.account.ct0
                 headers["x-csrf-token"] = self.account.ct0
+        else:
+            if "auth_token" in cookies:
+                del cookies["auth_token"]
+            if "x-twitter-auth-type" in headers:
+                del headers["x-twitter-auth-type"]
 
         # fmt: off
         log_message = (f"(auth_token={self.account.hidden_auth_token}, id={self.account.id}, username={self.account.username})"
@@ -152,7 +158,7 @@ class Client(BaseHTTPClient):
                      f"\nResponse data: {data}")
         # fmt: on
 
-        if ct0 := self._session.cookies.get("ct0", domain=".twitter.com"):
+        if ct0 := self._session.cookies.get("ct0", domain=".x.com"):
             self.account.ct0 = ct0
 
         auth_token = self._session.cookies.get("auth_token")
@@ -172,9 +178,9 @@ class Client(BaseHTTPClient):
             if isinstance(data, dict) and "errors" in data:
                 exc = HTTPException(response, data)
 
-                if 141 in exc.api_codes:
+                if 141 in exc.api_codes or 37 in exc.api_codes:
                     self.account.status = AccountStatus.SUSPENDED
-                    raise Suspended(exc, self.account)
+                    raise AccountSuspended(exc, self.account)
 
                 if 326 in exc.api_codes:
                     for error_data in exc.api_errors:
@@ -184,23 +190,29 @@ class Client(BaseHTTPClient):
                             == "/i/flow/consent_flow"
                         ):
                             self.account.status = AccountStatus.CONSENT_LOCKED
-                            raise ConsentLocked(exc, self.account)
+                            raise AccountConsentLocked(exc, self.account)
 
                     self.account.status = AccountStatus.LOCKED
-                    raise Locked(exc, self.account)
+                    raise AccountLocked(exc, self.account)
                 raise exc
 
             return response, data
 
         if response.status_code == 400:
-            raise BadRequest(response, data)
+            exc = BadRequest(response, data)
+
+            if 399 in exc.api_codes:
+                self.account.status = AccountStatus.NOT_FOUND
+                raise AccountNotFound(exc, self.account)
+
+            raise exc
 
         if response.status_code == 401:
             exc = Unauthorized(response, data)
 
             if 32 in exc.api_codes:
                 self.account.status = AccountStatus.BAD_TOKEN
-                raise BadToken(exc, self.account)
+                raise BadAccountToken(exc, self.account)
 
             raise exc
 
@@ -209,7 +221,7 @@ class Client(BaseHTTPClient):
 
             if 64 in exc.api_codes:
                 self.account.status = AccountStatus.SUSPENDED
-                raise Suspended(exc, self.account)
+                raise AccountSuspended(exc, self.account)
 
             if 326 in exc.api_codes:
                 for error_data in exc.api_errors:
@@ -218,10 +230,10 @@ class Client(BaseHTTPClient):
                         and error_data.get("bounce_location") == "/i/flow/consent_flow"
                     ):
                         self.account.status = AccountStatus.CONSENT_LOCKED
-                        raise ConsentLocked(exc, self.account)
+                        raise AccountConsentLocked(exc, self.account)
 
                 self.account.status = AccountStatus.LOCKED
-                raise Locked(exc, self.account)
+                raise AccountLocked(exc, self.account)
 
             raise exc
 
@@ -261,19 +273,20 @@ class Client(BaseHTTPClient):
         *,
         auto_unlock: bool = True,
         auto_relogin: bool = None,
+        rerequest_on_bad_ct0: bool = True,
         **kwargs,
     ) -> tuple[requests.Response, Any]:
         try:
             return await self._request(method, url, **kwargs)
 
-        except Locked:
+        except AccountLocked:
             if not self.capsolver_api_key or not auto_unlock:
                 raise
 
             await self.unlock()
             return await self._request(method, url, **kwargs)
 
-        except BadToken:
+        except BadAccountToken:
             if auto_relogin is None:
                 auto_relogin = self.auto_relogin
             if (
@@ -284,11 +297,17 @@ class Client(BaseHTTPClient):
                 raise
 
             await self.relogin()
-            return await self._request(method, url, **kwargs)
+            return await self.request(method, url, auto_relogin=False, **kwargs)
 
         except Forbidden as exc:
-            if 353 in exc.api_codes and "ct0" in exc.response.cookies:
-                return await self.request(method, url, **kwargs)
+            if (
+                rerequest_on_bad_ct0
+                and 353 in exc.api_codes
+                and "ct0" in exc.response.cookies
+            ):
+                return await self.request(
+                    method, url, rerequest_on_bad_ct0=False, **kwargs
+                )
             else:
                 raise
 
@@ -307,7 +326,7 @@ class Client(BaseHTTPClient):
         scope: str,
         response_type: str,
     ) -> str:
-        url = "https://twitter.com/i/api/2/oauth2/authorize"
+        url = "https://x.com/i/api/2/oauth2/authorize"
         querystring = {
             "client_id": client_id,
             "code_challenge": code_challenge,
@@ -329,7 +348,7 @@ class Client(BaseHTTPClient):
         headers = {"content-type": "application/x-www-form-urlencoded"}
         await self.request(
             "POST",
-            "https://twitter.com/i/api/2/oauth2/authorize",
+            "https://x.com/i/api/2/oauth2/authorize",
             headers=headers,
             data=data,
         )
@@ -373,7 +392,7 @@ class Client(BaseHTTPClient):
 
         :return: Response: html страница привязки приложения (аутентификации) старого типа.
         """
-        url = "https://api.twitter.com/oauth/authenticate"
+        url = "https://api.x.com/oauth/authenticate"
         oauth_params["oauth_token"] = oauth_token
         response, _ = await self.request("GET", url, params=oauth_params)
 
@@ -391,7 +410,7 @@ class Client(BaseHTTPClient):
         authenticity_token: str,
         redirect_after_login_url: str,
     ) -> requests.Response:
-        url = "https://api.twitter.com/oauth/authorize"
+        url = "https://api.x.com/oauth/authorize"
         params = {
             "redirect_after_login": redirect_after_login_url,
             "authenticity_token": authenticity_token,
@@ -421,7 +440,7 @@ class Client(BaseHTTPClient):
         return authenticity_token, redirect_url
 
     async def _update_account_username(self):
-        url = "https://twitter.com/i/api/1.1/account/settings.json"
+        url = "https://x.com/i/api/1.1/account/settings.json"
         response, response_json = await self.request("POST", url)
         self.account.username = response_json["screen_name"]
 
@@ -447,9 +466,9 @@ class Client(BaseHTTPClient):
             "withAuxiliaryUserLabels": False,
         }
         params = {
-            "variables": to_json(variables),
-            "features": to_json(features),
-            "fieldToggles": to_json(field_toggles),
+            "variables": variables,
+            "features": features,
+            "fieldToggles": field_toggles,
         }
         response, data = await self.request("GET", url, params=params)
         if not data["data"]:
@@ -536,7 +555,7 @@ class Client(BaseHTTPClient):
 
         :return: Media
         """
-        url = "https://upload.twitter.com/1.1/media/upload.json"
+        url = "https://upload.x.com/1.1/media/upload.json"
         payload = {"media_data": base64.b64encode(image)}
         for attempt in range(attempts):
             try:
@@ -561,7 +580,7 @@ class Client(BaseHTTPClient):
                     raise
 
     async def _follow_action(self, action: str, user_id: int | str) -> bool:
-        url = f"https://twitter.com/i/api/1.1/friendships/{action}.json"
+        url = f"https://x.com/i/api/1.1/friendships/{action}.json"
         params = {
             "include_profile_interstitial_type": "1",
             "include_blocking": "1",
@@ -691,7 +710,7 @@ class Client(BaseHTTPClient):
         return is_deleted
 
     async def pin_tweet(self, tweet_id: str | int) -> bool:
-        url = "https://api.twitter.com/1.1/account/pin_tweet.json"
+        url = "https://api.x.com/1.1/account/pin_tweet.json"
         data = {
             "tweet_mode": "extended",
             "id": str(tweet_id),
@@ -741,9 +760,12 @@ class Client(BaseHTTPClient):
             "longform_notetweets_consumption_enabled": True,
             "responsive_web_twitter_article_tweet_consumption_enabled": True,
             "tweet_awards_web_tipping_enabled": False,
+            "creator_subscriptions_quote_tweet_preview_enabled": False,
             "longform_notetweets_rich_text_read_enabled": True,
             "longform_notetweets_inline_media_enabled": True,
+            "articles_preview_enabled": True,
             "rweb_video_timestamps_enabled": True,
+            "rweb_tipjar_consumption_enabled": True,
             "responsive_web_graphql_exclude_directive_enabled": True,
             "verified_phone_label_enabled": False,
             "freedom_of_speech_not_reach_fetch_enabled": True,
@@ -866,7 +888,7 @@ class Client(BaseHTTPClient):
         """
         :return: Raw vote information
         """
-        url = "https://caps.twitter.com/v2/capi/passthrough/1"
+        url = "https://caps.x.com/v2/capi/passthrough/1"
         params = {
             "twitter:string:card_uri": f"card://{card_id}",
             "twitter:long:original_tweet_id": str(tweet_id),
@@ -915,8 +937,8 @@ class Client(BaseHTTPClient):
             "responsive_web_enhance_cards_enabled": False,
         }
         params = {
-            "variables": to_json(variables),
-            "features": to_json(features),
+            "variables": variables,
+            "features": features,
         }
         response, response_json = await self.request("GET", url, params=params)
 
@@ -1008,8 +1030,8 @@ class Client(BaseHTTPClient):
             "responsive_web_enhance_cards_enabled": False,
         }
         query = {
-            "variables": to_json(variables),
-            "features": to_json(features),
+            "variables": variables,
+            "features": features,
         }
         response, data = await self.request("GET", url, params=query)
         instructions = data["data"]["threaded_conversation_with_injections_v2"]["instructions"]  # type: ignore
@@ -1053,7 +1075,7 @@ class Client(BaseHTTPClient):
             "responsive_web_media_download_video_enabled": False,
             "responsive_web_enhance_cards_enabled": False,
         }
-        params = {"variables": to_json(variables), "features": to_json(features)}
+        params = {"variables": variables, "features": features}
         response, data = await self.request("GET", url, params=params)
 
         instructions = data["data"]["user"]["result"]["timeline_v2"]["timeline"][
@@ -1081,7 +1103,7 @@ class Client(BaseHTTPClient):
         """
         :return: Image URL
         """
-        url = f"https://api.twitter.com/1.1/account/update_profile_{type}.json"
+        url = f"https://api.x.com/1.1/account/update_profile_{type}.json"
         params = {
             "media_id": str(media_id),
             "include_profile_interstitial_type": "1",
@@ -1116,7 +1138,7 @@ class Client(BaseHTTPClient):
         return await self._update_profile_image("banner", media_id)
 
     async def change_username(self, username: str) -> bool:
-        url = "https://twitter.com/i/api/1.1/account/settings.json"
+        url = "https://x.com/i/api/1.1/account/settings.json"
         payload = {"screen_name": username}
         response, data = await self.request("POST", url, data=payload)
         new_username = data["screen_name"]
@@ -1131,7 +1153,7 @@ class Client(BaseHTTPClient):
         if not self.account.password:
             raise ValueError(f"Specify the current password before changing it")
 
-        url = "https://twitter.com/i/api/i/account/change_password.json"
+        url = "https://x.com/i/api/i/account/change_password.json"
         payload = {
             "current_password": self.account.password,
             "password": password,
@@ -1155,7 +1177,7 @@ class Client(BaseHTTPClient):
         if name is None and description is None:
             raise ValueError("Specify at least one param")
 
-        url = "https://twitter.com/i/api/1.1/account/update_profile.json"
+        url = "https://x.com/i/api/1.1/account/update_profile.json"
         # Создаем словарь data, включая в него только те ключи, для которых значения не равны None
         payload = {
             k: v
@@ -1180,7 +1202,7 @@ class Client(BaseHTTPClient):
         return updated
 
     async def establish_status(self):
-        url = "https://twitter.com/i/api/1.1/account/update_profile.json"
+        url = "https://x.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
@@ -1195,7 +1217,7 @@ class Client(BaseHTTPClient):
         visibility: Literal["self", "mutualfollow"] = "self",
         year_visibility: Literal["self"] = "self",
     ) -> bool:
-        url = "https://twitter.com/i/api/1.1/account/update_profile.json"
+        url = "https://x.com/i/api/1.1/account/update_profile.json"
         payload = {
             "birthdate_day": day,
             "birthdate_month": month,
@@ -1220,7 +1242,7 @@ class Client(BaseHTTPClient):
         """
         :return: Event data
         """
-        url = "https://api.twitter.com/1.1/direct_messages/events/new.json"
+        url = "https://api.x.com/1.1/direct_messages/events/new.json"
         payload = {
             "event": {
                 "type": "message_create",
@@ -1242,7 +1264,7 @@ class Client(BaseHTTPClient):
 
         :return: Event data
         """
-        url = f"https://api.twitter.com/2/dm_conversations/{conversation_id}/messages"
+        url = f"https://api.x.com/2/dm_conversations/{conversation_id}/messages"
         payload = {"text": text}
         response, response_json = await self.request("POST", url, json=payload)
         event_data = response_json["event"]
@@ -1252,7 +1274,7 @@ class Client(BaseHTTPClient):
         """
         :return: Messages data
         """
-        url = "https://twitter.com/i/api/1.1/dm/inbox_initial_state.json"
+        url = "https://x.com/i/api/1.1/dm/inbox_initial_state.json"
         params = {
             "nsfw_filtering_enabled": "false",
             "filter_low_quality": "false",
@@ -1394,7 +1416,7 @@ class Client(BaseHTTPClient):
                 verification_string=token,
             )
 
-            if response.url == "https://twitter.com/?lang=en":
+            if response.url == "https://x.com/?lang=en":
                 break
 
             (
@@ -1424,7 +1446,7 @@ class Client(BaseHTTPClient):
         await self.establish_status()
 
     async def update_backup_code(self):
-        url = "https://api.twitter.com/1.1/account/backup_code.json"
+        url = "https://api.x.com/1.1/account/backup_code.json"
         response, response_json = await self.request("GET", url)
         self.account.backup_code = response_json["codes"][0]
 
@@ -1432,7 +1454,7 @@ class Client(BaseHTTPClient):
         """
         :return: flow_token and subtasks
         """
-        url = "https://api.twitter.com/1.1/onboarding/task.json"
+        url = "https://api.x.com/1.1/onboarding/task.json"
         response, data = await self.request("POST", url, **request_kwargs)
         subtasks = [
             Subtask.from_raw_data(subtask_data) for subtask_data in data["subtasks"]
@@ -1609,6 +1631,7 @@ class Client(BaseHTTPClient):
     async def _viewer(self):
         url, query_id = self._action_to_url("Viewer")
         features = {
+            "rweb_tipjar_consumption_enabled": True,
             "responsive_web_graphql_exclude_directive_enabled": True,
             "verified_phone_label_enabled": False,
             "creator_subscriptions_tweet_preview_api_enabled": True,
@@ -1633,12 +1656,12 @@ class Client(BaseHTTPClient):
 
         :return: guest_token
         """
-        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
+        response, data = await self._request(
+            "POST",
+            "https://api.x.com/1.1/guest/activate.json",
+            auth=False,
+        )
+        return data["guest_token"]
 
     async def _login(self) -> bool:
         update_backup_code = False
@@ -1733,6 +1756,7 @@ class Client(BaseHTTPClient):
                 else:
                     raise
 
+        await self._viewer()
         await self._complete_subtask(flow_token, [])
         return update_backup_code
 
@@ -1750,7 +1774,6 @@ class Client(BaseHTTPClient):
             raise ValueError("No password")
 
         update_backup_code = await self._login()
-        await self._viewer()
 
         if update_backup_code:
             await self.update_backup_code()
@@ -1774,7 +1797,7 @@ class Client(BaseHTTPClient):
         if not self.account.id:
             await self.update_account_info()
 
-        url = f"https://twitter.com/i/api/1.1/strato/column/User/{self.account.id}/account-security/twoFactorAuthSettings2"
+        url = f"https://x.com/i/api/1.1/strato/column/User/{self.account.id}/account-security/twoFactorAuthSettings2"
         response, data = await self.request("GET", url)
         # fmt: off
         return "Totp" in [method_data["twoFactorType"] for method_data in data["methods"]]
@@ -1926,3 +1949,148 @@ class Client(BaseHTTPClient):
             raise ValueError("Password required to enable TOTP")
 
         await self._enable_totp()
+
+
+class GQLClient:
+    _GRAPHQL_URL = "https://x.com/i/api/graphql"
+    _OPERATION_TO_QUERY_ID = {
+        "CreateRetweet": "ojPdsZsimiJrUGLR1sjUtA",
+        "FavoriteTweet": "lI07N6Otwv1PhnEgXILM7A",
+        "UnfavoriteTweet": "ZYKSe-w7KEslx3JhSIk5LA",
+        "CreateTweet": "v0en1yVV-Ybeek8ClmXwYw",
+        "TweetResultByRestId": "V3vfsYzNEyD9tsf4xoFRgw",
+        "ModerateTweet": "p'jF:GVqCjTcZol0xcBJjw",
+        "DeleteTweet": "VaenaVgh5q5ih7kvyVjgtg",
+        "UserTweets": "V1ze5q3ijDS1VeLwLY0m7g",
+        "TweetDetail": "VWFGPVAGkZMGRKGe3GFFnA",
+        "ProfileSpotlightsQuery": "9zwVLJ48lmVUk8u_Gh9DmA",
+        "Following": "t-BPOrMIduGUJWO_LxcvNQ",
+        "Followers": "3yX7xr2hKjcZYnXt6cU6lQ",
+        "UserByScreenName": "G3KGOASz96M-Qu0nwmGXNg",
+        "UsersByRestIds": "itEhGywpgX9b3GJCzOtSrA",
+        "Viewer": "-876iyxD1O_0X0BqeykjZA",
+    }
+    _DEFAULT_VARIABLES = {
+        "count": 1000,
+        "withSafetyModeUserFields": True,
+        "includePromotedContent": True,
+        "withQuickPromoteEligibilityTweetFields": True,
+        "withVoice": True,
+        "withV2Timeline": True,
+        "withDownvotePerspective": False,
+        "withBirdwatchNotes": True,
+        "withCommunity": True,
+        "withSuperFollowsUserFields": True,
+        "withReactionsMetadata": False,
+        "withReactionsPerspective": False,
+        "withSuperFollowsTweetFields": True,
+        "isMetatagsQuery": False,
+        "withReplays": True,
+        "withClientEventToken": False,
+        "withAttachments": True,
+        "withConversationQueryHighlights": True,
+        "withMessageQueryHighlights": True,
+        "withMessages": True,
+    }
+    _DEFAULT_FEATURES = {
+        "c9s_tweet_anatomy_moderator_badge_enabled": True,
+        "responsive_web_home_pinned_timelines_enabled": True,
+        "blue_business_profile_image_shape_enabled": True,
+        "creator_subscriptions_tweet_preview_api_enabled": True,
+        "freedom_of_speech_not_reach_fetch_enabled": True,
+        "graphql_is_translatable_rweb_tweet_is_translatable_enabled": True,
+        "graphql_timeline_v2_bookmark_timeline": True,
+        "hidden_profile_likes_enabled": True,
+        "highlights_tweets_tab_ui_enabled": True,
+        "interactive_text_enabled": True,
+        "longform_notetweets_consumption_enabled": True,
+        "longform_notetweets_inline_media_enabled": True,
+        "longform_notetweets_rich_text_read_enabled": True,
+        "longform_notetweets_richtext_consumption_enabled": True,
+        "profile_foundations_tweet_stats_enabled": True,
+        "profile_foundations_tweet_stats_tweet_frequency": True,
+        "responsive_web_birdwatch_note_limit_enabled": True,
+        "responsive_web_edit_tweet_api_enabled": True,
+        "responsive_web_enhance_cards_enabled": False,
+        "responsive_web_graphql_exclude_directive_enabled": True,
+        "responsive_web_graphql_skip_user_profile_image_extensions_enabled": False,
+        "responsive_web_graphql_timeline_navigation_enabled": True,
+        "responsive_web_media_download_video_enabled": False,
+        "responsive_web_text_conversations_enabled": False,
+        "responsive_web_twitter_article_data_v2_enabled": True,
+        "responsive_web_twitter_article_tweet_consumption_enabled": False,
+        "responsive_web_twitter_blue_verified_badge_is_enabled": True,
+        "rweb_lists_timeline_redesign_enabled": True,
+        "spaces_2022_h2_clipping": True,
+        "spaces_2022_h2_spaces_communities": True,
+        "standardized_nudges_misinfo": True,
+        "subscriptions_verification_info_verified_since_enabled": True,
+        "tweet_awards_web_tipping_enabled": False,
+        "tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled": True,
+        "tweetypie_unmention_optimization_enabled": True,
+        "verified_phone_label_enabled": False,
+        "vibe_api_enabled": True,
+        "view_counts_everywhere_api_enabled": True,
+        "hidden_profile_subscriptions_enabled": True,
+        "subscriptions_verification_info_is_identity_verified_enabled": True,
+    }
+
+    @classmethod
+    def _operation_to_url(cls, operation: str) -> tuple[str, str]:
+        """
+        :return: URL and Query ID
+        """
+        query_id = cls._OPERATION_TO_QUERY_ID[operation]
+        url = f"{cls._GRAPHQL_URL}/{query_id}/{operation}"
+        return url, query_id
+
+    def __init__(self, client: Client):
+        self._client = client
+
+    async def gql_request(
+        self, method, operation, **kwargs
+    ) -> tuple[requests.Response, dict]:
+        url, query_id = self._operation_to_url(operation)
+
+        if method == "POST":
+            payload = kwargs["json"] = kwargs.get("json") or {}
+            payload["queryId"] = query_id
+        else:
+            params = kwargs["params"] = kwargs.get("params") or {}
+            ...
+
+        response, data = await self._client.request(method, url, **kwargs)
+        return response, data["data"]
+
+    async def user_by_username(self, username: str) -> User | None:
+        features = self._DEFAULT_FEATURES
+        variables = self._DEFAULT_VARIABLES
+        variables["screen_name"] = username
+        params = {
+            "variables": variables,
+            "features": features,
+        }
+        response, data = await self.gql_request(
+            "GET", "UserByScreenName", params=params
+        )
+        return User.from_raw_data(data["user"]["result"]) if data else None
+
+    async def users_by_ids(
+        self, user_ids: Iterable[str | int]
+    ) -> dict[int : User | Account]:
+        features = self._DEFAULT_FEATURES
+        variables = self._DEFAULT_VARIABLES
+        variables["userIds"] = list({str(user_id) for user_id in user_ids})
+        params = {
+            "variables": variables,
+            "features": features,
+        }
+        response, data = await self.gql_request("GET", "UsersByRestIds", params=params)
+
+        users = {}
+        for user_data in data["users"]:
+            user = User.from_raw_data(user_data["result"])
+            users[user.id] = user
+            if user.id == self._client.account.id:
+                users[self._client.account.id] = self._client.account
+        return users

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/enums.py

@@ -8,6 +8,7 @@ class AccountStatus(enum.StrEnum):
     LOCKED = "LOCKED"
     CONSENT_LOCKED = "CONSENT_LOCKED"
     GOOD = "GOOD"
+    NOT_FOUND = "NOT_FOUND"
 
     def __str__(self):
         return self.value

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/errors.py

@@ -13,10 +13,11 @@ __all__ = [
     "RateLimited",
     "ServerError",
     "BadAccount",
-    "BadToken",
-    "Locked",
-    "ConsentLocked",
-    "Suspended",
+    "BadAccountToken",
+    "AccountLocked",
+    "AccountConsentLocked",
+    "AccountSuspended",
+    "AccountNotFound",
 ]
 
 
@@ -149,7 +150,7 @@ class BadAccount(TwitterException):
         super().__init__(exception_message)
 
 
-class BadToken(BadAccount):
+class BadAccountToken(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
         exception_message = (
             "Bad Twitter account's auth_token. Relogin to get new token."
@@ -157,7 +158,7 @@ class BadToken(BadAccount):
         super().__init__(http_exception, account, exception_message)
 
 
-class Locked(BadAccount):
+class AccountLocked(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
         exception_message = (
             f"Twitter account is locked."
@@ -166,13 +167,19 @@ class Locked(BadAccount):
         super().__init__(http_exception, account, exception_message)
 
 
-class ConsentLocked(BadAccount):
+class AccountConsentLocked(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
         exception_message = f"Twitter account is locked."
         super().__init__(http_exception, account, exception_message)
 
 
-class Suspended(BadAccount):
+class AccountSuspended(BadAccount):
     def __init__(self, http_exception: "HTTPException", account: Account):
         exception_message = f"Twitter account is suspended."
         super().__init__(http_exception, account, exception_message)
+
+
+class AccountNotFound(BadAccount):
+    def __init__(self, http_exception: "HTTPException", account: Account):
+        exception_message = f"Twitter account not found or deleted."
+        super().__init__(http_exception, account, exception_message)

{tweepy_self-1.10.0b9 → tweepy_self-1.11.1}/twitter/models.py

@@ -26,6 +26,9 @@ class Media(BaseModel):
     def __str__(self):
         return str(self.id)
 
+    def __hash__(self):
+        return hash(self.id)
+
 
 class User(BaseModel):
     # fmt: off
@@ -46,6 +49,9 @@ class User(BaseModel):
     def __repr__(self):
         return f"{self.__class__.__name__}(id={self.id}, username={self.username})"
 
+    def __hash__(self):
+        return hash(self.id)
+
     @classmethod
     def from_raw_data(cls, data: dict):
         legacy = data["legacy"]
@@ -105,6 +111,9 @@ class Tweet(BaseModel):
     def __repr__(self):
         return f"{self.__class__.__name__}(id={self.id}, user_id={self.user.id})"
 
+    def __hash__(self):
+        return hash(self.id)
+
     @property
     def short_text(self) -> str:
         return f"{self.text[:32]}..." if len(self.text) > 16 else self.text
@@ -162,6 +171,9 @@ class Subtask(BaseModel):
     detail_text: Optional[str] = None
     raw_data: dict
 
+    def __hash__(self):
+        return hash(self.id)
+
     @classmethod
     def from_raw_data(cls, data: dict) -> "Subtask":
         task = {"id": data["subtask_id"]}