Add files via upload

ratelimits.md

@@ -7,9 +7,9 @@ Rate Limits
 <table>
     <thead>
         <tr>
-            <th>Endpoint</th>
-            <th>Limit</th>
             <th>Functions</th>
+            <th>Limit</th>
+            <th>Endpoint</th>
         </tr>
     </thead>
     <tbody>

twikit/__init__.py

@@ -25,4 +25,4 @@
 from .user import User
 from .utils import build_query
 
-__version__ = '1.3.15'
+__version__ = '1.3.16'

twikit/client.py

@@ -13,6 +13,8 @@
     CouldNotTweet,
     TweetNotAvailable,
     TwitterException,
+    UserNotFound,
+    UserUnavailable,
     raise_exceptions_from_response
 )
 from .group import Group, GroupMessage
@@ -1102,7 +1104,13 @@ def get_user_by_screen_name(self, screen_name: str) -> User:
             params=params,
             headers=self._base_headers
         ).json()
+
+        if 'user' not in response['data']:
+            raise UserNotFound('The user does not exist.')
         user_data = response['data']['user']['result']
+        if user_data.get('__typename') == 'UserUnavailable':
+            raise UserUnavailable(user_data.get('message'))
+
         return User(self, user_data)
 
     def get_user_by_id(self, user_id: str) -> User:
@@ -1237,7 +1245,10 @@ def get_tweet_by_id(
                 continue
             tweet_info = tweet_info_[0]
 
-            if tweet_info['__typename'] == 'TweetWithVisibilityResults':
+            if tweet_info.get('__typename') == 'TweetTombstone':
+                continue
+
+            if tweet_info.get('__typename') == 'TweetWithVisibilityResults':
                 tweet_info = tweet_info['tweet']
 
             user_info = find_dict(tweet_info, 'user_results')[0]['result']

twikit/errors.py

@@ -59,6 +59,16 @@ class InvalidMedia(TwitterException):
     sent with the tweet.
     """
 
+class UserNotFound(TwitterException):
+    """
+    Exception raised when a user does not exsit.
+    """
+
+class UserUnavailable(TwitterException):
+    """
+    Exception raised when a user is unavailable.
+    """
+
 ERROR_CODE_TO_EXCEPTION: dict[int, TwitterException] = {
     187: DuplicateTweet,
     324: InvalidMedia

twikit/twikit_async/client.py

@@ -13,6 +13,8 @@
     CouldNotTweet,
     TweetNotAvailable,
     TwitterException,
+    UserNotFound,
+    UserUnavailable,
     raise_exceptions_from_response
 )
 from ..utils import (
@@ -1116,7 +1118,13 @@ async def get_user_by_screen_name(self, screen_name: str) -> User:
             params=params,
             headers=self._base_headers
         )).json()
+
+        if 'user' not in response['data']:
+            raise UserNotFound('The user does not exist.')
         user_data = response['data']['user']['result']
+        if user_data.get('__typename') == 'UserUnavailable':
+            raise UserUnavailable(user_data.get('message'))
+
         return User(self, user_data)
 
     async def get_user_by_id(self, user_id: str) -> User:
@@ -1253,6 +1261,9 @@ async def get_tweet_by_id(
                 continue
             tweet_info = tweet_info_[0]
 
+            if tweet_info.get('__typename') == 'TweetTombstone':
+                continue
+
             if tweet_info['__typename'] == 'TweetWithVisibilityResults':
                 tweet_info = tweet_info['tweet']