tweepy-self 1.5.4__py3-none-any.whl → 1.6.0__py3-none-any.whl

{tweepy_self-1.5.4.dist-info → tweepy_self-1.6.0.dist-info}/METADATA

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

{tweepy_self-1.5.4.dist-info → tweepy_self-1.6.0.dist-info}/RECORD

@@ -3,14 +3,14 @@ twitter/account.py,sha256=tHzBdc34pEJI2SRbjLcmKtwAzjhzUFsa4vIQqtXAc1s,3015
 twitter/base/__init__.py,sha256=x0EHKv4q_FI6xEq2nL4V9s8P6VWr6IaHTqdH9sXB5d8,133
 twitter/base/client.py,sha256=7byb0Psai-dvg_ww6Y7uyE2hV1pfTU653hFgVdRiqXo,478
 twitter/base/session.py,sha256=JFPS-9Qae1iY3NfNcywxvWWmRDijaU_Rjs3WaQ00iFA,2071
-twitter/client.py,sha256=6n-XUZA-6alpV2k3swHhIL84P7-5zKgzDnqW5sYP720,58728
+twitter/client.py,sha256=qfIQrzGb-dju2lTaKX820zGDADv8PmsS5cIhEk9p8oE,60960
 twitter/enums.py,sha256=-OH6Ibxarq5qt4E2AhkProVawcEyIf5YG_h_G5xiV9Y,270
-twitter/errors.py,sha256=Y7Cn-jTBKcESNZfbwjy90kPmQwkyeRIZIVsW5kctGN0,4907
-twitter/models.py,sha256=9ZupMWy7nl7LFUNzLiRD0uDUbZCR6OwCbZt0VETCjns,2035
+twitter/errors.py,sha256=PsvGP3hps1HNWdKbUPhEkuDqLUmmqzhpAkRtVrJr5jc,5007
+twitter/models.py,sha256=ttSNuhY1knTdI-Yty54OCJF5YzARc8IaA11zKNHV9p0,2063
 twitter/utils/__init__.py,sha256=pyhQXwTdp0HFwV_UNF4dTyklLD9RtaefA16SrQXeNlg,589
 twitter/utils/file.py,sha256=Sz2KEF9DnL04aOP1XabuMYMMF4VR8dJ_KWMEVvQ666Y,1120
 twitter/utils/html.py,sha256=hVtIRFI2yRAdWEaShFNBG-_ZWxd16og8i8OVDnFy5Hc,1971
 twitter/utils/other.py,sha256=UnUxS3uDR4eggbNN16xiw96VC_MNt9tOgnBlNWvRBoY,559
-tweepy_self-1.5.4.dist-info/METADATA,sha256=LZMLxfYg3Ck9A6T8CAPztL6-Ow6RvZky7vOkWPFTi7U,9136
-tweepy_self-1.5.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-tweepy_self-1.5.4.dist-info/RECORD,,
+tweepy_self-1.6.0.dist-info/METADATA,sha256=v5tR7xSal8DNv3iwMStoxzc-jtLnSrHUX90pxDaN0Ik,9136
+tweepy_self-1.6.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+tweepy_self-1.6.0.dist-info/RECORD,,

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
@@ -520,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": {
@@ -564,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

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],

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 = (