tweepy-self 1.5.2__tar.gz → 1.6.0__tar.gz

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/PKG-INFO

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

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/pyproject.toml

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

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/twitter/account.py

@@ -1,26 +1,15 @@
 from pathlib import Path
 from typing import Sequence, Iterable
-import enum
 
 from pydantic import BaseModel, Field
 import pyotp
 
 from .utils import hidden_value, load_lines, write_lines
-
-
-class AccountStatus(enum.StrEnum):
-    UNKNOWN        = "UNKNOWN"
-    BAD_TOKEN      = "BAD_TOKEN"
-    SUSPENDED      = "SUSPENDED"
-    LOCKED         = "LOCKED"
-    CONSENT_LOCKED = "CONSENT_LOCKED"
-    GOOD           = "GOOD"
-
-    def __str__(self):
-        return self.value
+from .enums import AccountStatus
 
 
 class Account(BaseModel):
+    # fmt: off
     auth_token:  str | None = Field(default=None, pattern=r"^[a-f0-9]{40}$")
     ct0:         str | None = None
     id:          int | None = None
@@ -31,6 +20,7 @@ class Account(BaseModel):
     totp_secret: str | None = None
     backup_code: str | None = None
     status: AccountStatus = AccountStatus.UNKNOWN
+    # fmt: on
 
     @property
     def hidden_auth_token(self) -> str | None:
@@ -62,10 +52,10 @@ class Account(BaseModel):
 
 
 def load_accounts_from_file(
-        filepath: Path | str,
-        *,
-        separator: str = ":",
-        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
+    filepath: Path | str,
+    *,
+    separator: str = ":",
+    fields: Sequence[str] = ("auth_token", "password", "email", "username"),
 ) -> list[Account]:
     """
     :param filepath: Путь до файла с данными об аккаунтах.
@@ -82,11 +72,11 @@ def load_accounts_from_file(
 
 
 def extract_accounts_to_file(
-        filepath: Path | str,
-        accounts: Iterable[Account],
-        *,
-        separator: str = ":",
-        fields: Sequence[str] = ("auth_token", "password", "email", "username"),
+    filepath: Path | str,
+    accounts: Iterable[Account],
+    *,
+    separator: str = ":",
+    fields: Sequence[str] = ("auth_token", "password", "email", "username"),
 ):
     lines = []
     for account in accounts:

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/twitter/client.py

@@ -11,6 +11,7 @@ from python3_capsolver.fun_captcha import FunCaptcha, FunCaptchaTypeEnm
 
 from .errors import (
     TwitterException,
+    FailedToFindDuplicatePost,
     HTTPException,
     BadRequest,
     Unauthorized,
@@ -24,7 +25,7 @@ from .errors import (
     ConsentLocked,
     Suspended,
 )
-from .utils import to_json
+from .utils import to_json, tweet_url as create_tweet_url
 from .base import BaseClient
 from .account import Account, AccountStatus
 from .models import UserData, Tweet
@@ -383,16 +384,37 @@ class Client(BaseClient):
                 await self.request_username()
             return await self._request_user_data(self.account.username)
 
-    async def upload_image(self, image: bytes) -> int:
+    async def upload_image(
+        self,
+        image: bytes,
+        attempts: int = 3,
+        timeout: float | tuple[float, float] = None,
+    ) -> int:
         """
         Upload image as bytes.
 
+        Иногда при первой попытке загрузки изображения возвращает 408,
+        после чего повторная попытка загрузки изображения проходит успешно
+
         :return: Media ID
         """
         url = "https://upload.twitter.com/1.1/media/upload.json"
 
         data = {"media_data": base64.b64encode(image)}
-        response, response_json = await self.request("POST", url, data=data)
+
+        for attempt in range(attempts):
+            try:
+                response, response_json = await self.request(
+                    "POST", url, data=data, timeout=timeout
+                )
+                media_id = response_json["media_id"]
+                return media_id
+            except HTTPException as exc:
+                if attempt < attempts - 1 and exc.response.status_code == 408:
+                    continue
+                else:
+                    raise
+
         media_id = response_json["media_id"]
         return media_id
 
@@ -499,7 +521,7 @@ class Client(BaseClient):
         media_id: int | str = None,
         tweet_id_to_reply: str | int = None,
         attachment_url: str = None,
-    ) -> int:
+    ) -> Tweet:
         url, query_id = self._action_to_url("CreateTweet")
         payload = {
             "variables": {
@@ -543,32 +565,103 @@ class Client(BaseClient):
             )
 
         response, response_json = await self.request("POST", url, json=payload)
-        tweet_id = response_json["data"]["create_tweet"]["tweet_results"]["result"][
-            "rest_id"
-        ]
-        return tweet_id
+        tweet = Tweet.from_raw_data(
+            response_json["data"]["create_tweet"]["tweet_results"]["result"]
+        )
+        return tweet
 
-    async def tweet(self, text: str, *, media_id: int | str = None) -> int:
-        """
-        :return: Tweet ID
-        """
-        return await self._tweet(text, media_id=media_id)
+    async def _tweet_or_search_duplicate(
+        self,
+        text: str = None,
+        *,
+        media_id: int | str = None,
+        tweet_id_to_reply: str | int = None,
+        attachment_url: str = None,
+        search_duplicate: bool = True,
+        with_tweet_url: bool = True,
+    ) -> Tweet:
+        try:
+            tweet = await self._tweet(
+                text,
+                media_id=media_id,
+                tweet_id_to_reply=tweet_id_to_reply,
+                attachment_url=attachment_url,
+            )
+        except HTTPException as exc:
+            if (
+                search_duplicate
+                and 187 in exc.api_codes  # duplicate tweet (Status is a duplicate)
+            ):
+                tweets = await self.request_tweets(self.account.id)
+                duplicate_tweet = None
+                for tweet_ in tweets:
+                    if tweet_.full_text == text:
+                        duplicate_tweet = tweet_
+
+                if not duplicate_tweet:
+                    raise FailedToFindDuplicatePost(
+                        f"Couldn't find a post duplicate in the next 20 posts"
+                    )
+                tweet = duplicate_tweet
+
+            else:
+                raise
+
+        if with_tweet_url:
+            if not self.account.username:
+                await self.request_user_data()
+            tweet.url = create_tweet_url(self.account.username, tweet.id)
+
+        return tweet
+
+    async def tweet(
+        self,
+        text: str,
+        *,
+        media_id: int | str = None,
+        search_duplicate: bool = True,
+        with_tweet_url: bool = True,
+    ) -> Tweet:
+        return await self._tweet_or_search_duplicate(
+            text,
+            media_id=media_id,
+            search_duplicate=search_duplicate,
+            with_tweet_url=with_tweet_url,
+        )
 
     async def reply(
-        self, tweet_id: str | int, text: str, *, media_id: int | str = None
-    ) -> int:
-        """
-        :return: Tweet ID
-        """
-        return await self._tweet(text, media_id=media_id, tweet_id_to_reply=tweet_id)
+        self,
+        tweet_id: str | int,
+        text: str,
+        *,
+        media_id: int | str = None,
+        search_duplicate: bool = True,
+        with_tweet_url: bool = True,
+    ) -> Tweet:
+        return await self._tweet_or_search_duplicate(
+            text,
+            media_id=media_id,
+            tweet_id_to_reply=tweet_id,
+            search_duplicate=search_duplicate,
+            with_tweet_url=with_tweet_url,
+        )
 
     async def quote(
-        self, tweet_url: str, text: str, *, media_id: int | str = None
-    ) -> int:
-        """
-        :return: Tweet ID
-        """
-        return await self._tweet(text, media_id=media_id, attachment_url=tweet_url)
+        self,
+        tweet_url: str,
+        text: str,
+        *,
+        media_id: int | str = None,
+        search_duplicate: bool = True,
+        with_tweet_url: bool = True,
+    ) -> Tweet:
+        return await self._tweet_or_search_duplicate(
+            text,
+            media_id=media_id,
+            attachment_url=tweet_url,
+            search_duplicate=search_duplicate,
+            with_tweet_url=with_tweet_url,
+        )
 
     async def vote(
         self, tweet_id: int | str, card_id: int | str, choice_number: int

tweepy_self-1.6.0/twitter/enums.py

@@ -0,0 +1,13 @@
+import enum
+
+
+class AccountStatus(enum.StrEnum):
+    UNKNOWN = "UNKNOWN"
+    BAD_TOKEN = "BAD_TOKEN"
+    SUSPENDED = "SUSPENDED"
+    LOCKED = "LOCKED"
+    CONSENT_LOCKED = "CONSENT_LOCKED"
+    GOOD = "GOOD"
+
+    def __str__(self):
+        return self.value

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/twitter/errors.py

@@ -4,6 +4,7 @@ from .account import Account
 
 __all__ = [
     "TwitterException",
+    "FailedToFindDuplicatePost",
     "HTTPException",
     "BadRequest",
     "Unauthorized",
@@ -23,6 +24,10 @@ class TwitterException(Exception):
     pass
 
 
+class FailedToFindDuplicatePost(TwitterException):
+    pass
+
+
 def _http_exception_message(
     response: requests.Response,
     api_errors: list[dict],

{tweepy_self-1.5.2 → tweepy_self-1.6.0}/twitter/models.py

@@ -47,6 +47,7 @@ class Tweet(BaseModel):
     retweet_count: int
     retweeted: bool
     raw_data: dict
+    url: str | None = None
 
     def __str__(self):
         short_text = (