Address changes

Author: coder2020official

telebot/__init__.py

@@ -6977,7 +6977,7 @@ def get_business_account_gifts(
         :param exclude_unlimited: Pass True to exclude gifts that can be purchased an unlimited number of times
         :type exclude_unlimited: :obj:`bool`
 
-        :param exclude_limited: Pass True to exclude gifts that can be purchased a limited number of times
+        :param exclude_limited: Deprecated, use exclude_limited_upgradable and exclude_limited_non_upgradable instead. 
         :type exclude_limited: :obj:`bool`
 
         :param exclude_unique: Pass True to exclude unique gifts
@@ -7004,10 +7004,16 @@ def get_business_account_gifts(
         :return: On success, a OwnedGifts object is returned.
         :rtype: :class:`telebot.types.OwnedGifts`
         """
-        if exclude_limited is not None and exclude_limited_upgradable is None and exclude_limited_non_upgradable is None:
-            exclude_limited_upgradable = exclude_limited
-            exclude_limited_non_upgradable = exclude_limited
 
+        if exclude_limited is not None:
+            logger.warning("Deprecation warning. 'exclude_limited' parameter is deprecated in get_business_account_gifts. Use 'exclude_limited_upgradable' and 'exclude_limited_non_upgradable' instead.")
+
+            if exclude_limited_upgradable is not None or exclude_limited_non_upgradable is not None:
+                logger.warning("Both 'exclude_limited' and 'exclude_limited_upgradable'/'exclude_limited_non_upgradable' parameters are set: conflicting, using 'exclude_limited_upgradable' and 'exclude_limited_non_upgradable' values.")
+            
+            else:
+                exclude_limited_upgradable = exclude_limited
+                exclude_limited_non_upgradable = exclude_limited
 
         return types.OwnedGifts.de_json(
             apihelper.get_business_account_gifts(

telebot/apihelper.py

@@ -2242,7 +2242,9 @@ def get_user_gifts(token, user_id, exclude_unlimited=None, exclude_limited_upgra
         payload['exclude_unique'] = exclude_unique
     if sort_by_price is not None:
         payload['sort_by_price'] = sort_by_price
-    if offset is not None:
+    if offset is None:
+        payload['offset'] = ""
+    else:
         payload['offset'] = offset
     if limit is not None:
         payload['limit'] = limit
@@ -2252,29 +2254,31 @@ def get_chat_gifts(token, chat_id, exclude_unsaved=None, exclude_saved=None,
                         exclude_unlimited=None, exclude_limited_upgradable=None,
                         exclude_limited_non_upgradable=None, exclude_from_blockchain=None,
                         exclude_unique=None, sort_by_price=None, offset=None, limit=None):
-        method_url = 'getChatGifts'
-        payload = {'chat_id': chat_id}
-        if exclude_unsaved is not None:
-                payload['exclude_unsaved'] = exclude_unsaved
-        if exclude_saved is not None:
-                payload['exclude_saved'] = exclude_saved
-        if exclude_unlimited is not None:
-                payload['exclude_unlimited'] = exclude_unlimited
-        if exclude_limited_upgradable is not None:
-                payload['exclude_limited_upgradable'] = exclude_limited_upgradable
-        if exclude_limited_non_upgradable is not None:
-                payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
-        if exclude_from_blockchain is not None:
-                payload['exclude_from_blockchain'] = exclude_from_blockchain
-        if exclude_unique is not None:
-                payload['exclude_unique'] = exclude_unique
-        if sort_by_price is not None:
-                payload['sort_by_price'] = sort_by_price
-        if offset is not None:
-                payload['offset'] = offset
+    method_url = 'getChatGifts'
+    payload = {'chat_id': chat_id}
+    if exclude_unsaved is not None:
+            payload['exclude_unsaved'] = exclude_unsaved
+    if exclude_saved is not None:
+            payload['exclude_saved'] = exclude_saved
+    if exclude_unlimited is not None:
+            payload['exclude_unlimited'] = exclude_unlimited
+    if exclude_limited_upgradable is not None:
+            payload['exclude_limited_upgradable'] = exclude_limited_upgradable
+    if exclude_limited_non_upgradable is not None:
+            payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
+    if exclude_from_blockchain is not None:
+            payload['exclude_from_blockchain'] = exclude_from_blockchain
+    if exclude_unique is not None:
+            payload['exclude_unique'] = exclude_unique
+    if sort_by_price is not None:
+            payload['sort_by_price'] = sort_by_price
+    if offset is None:
+        payload['offset'] = ""
+    else:
+        payload['offset'] = offset
         if limit is not None:
                 payload['limit'] = limit
-        return _make_request(token, method_url, params=payload)
+    return _make_request(token, method_url, params=payload)
 
 
 def convert_gift_to_stars(token, business_connection_id, owned_gift_id):

telebot/async_telebot.py

@@ -8439,7 +8439,7 @@ async def get_business_account_gifts(
         :param exclude_unlimited: Pass True to exclude gifts that can be purchased an unlimited number of times
         :type exclude_unlimited: :obj:`bool`
 
-        :param exclude_limited: Pass True to exclude gifts that can be purchased a limited number of times
+        :param exclude_limited: Deprecated, use exclude_limited_upgradable and exclude_limited_non_upgradable instead. 
         :type exclude_limited: :obj:`bool`
 
         :param exclude_unique: Pass True to exclude unique gifts
@@ -8466,9 +8466,15 @@ async def get_business_account_gifts(
         :return: On success, a OwnedGifts object is returned.
         :rtype: :class:`telebot.types.OwnedGifts`
         """
-        if exclude_limited is not None and exclude_limited_upgradable is None and exclude_limited_non_upgradable is None:
-            exclude_limited_upgradable = exclude_limited
-            exclude_limited_non_upgradable = exclude_limited
+        if exclude_limited is not None:
+            logger.warning("Deprecation warning. 'exclude_limited' parameter is deprecated in get_business_account_gifts. Use 'exclude_limited_upgradable' and 'exclude_limited_non_upgradable' instead.")
+
+            if exclude_limited_upgradable is not None or exclude_limited_non_upgradable is not None:
+                logger.warning("Both 'exclude_limited' and 'exclude_limited_upgradable'/'exclude_limited_non_upgradable' parameters are set: conflicting, using 'exclude_limited_upgradable' and 'exclude_limited_non_upgradable' values.")
+            
+            else:
+                exclude_limited_upgradable = exclude_limited
+                exclude_limited_non_upgradable = exclude_limited
 
         return types.OwnedGifts.de_json(
             await asyncio_helper.get_business_account_gifts(

telebot/asyncio_helper.py

@@ -2194,55 +2194,59 @@ async def get_business_account_gifts(token, business_connection_id, exclude_unsa
     return await _process_request(token, method_url, params=payload)
 
 async def get_user_gifts(token, user_id, exclude_unlimited=None, exclude_limited_upgradable=None,
-                     exclude_limited_non_upgradable=None, exclude_from_blockchain=None, exclude_unique=None,
-                     sort_by_price=None, offset=None, limit=None):
-     method_url = 'getUserGifts'
-     payload = {'user_id': user_id}
-     if exclude_unlimited is not None:
-          payload['exclude_unlimited'] = exclude_unlimited
-     if exclude_limited_upgradable is not None:
-          payload['exclude_limited_upgradable'] = exclude_limited_upgradable
-     if exclude_limited_non_upgradable is not None:
-          payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
-     if exclude_from_blockchain is not None:
-          payload['exclude_from_blockchain'] = exclude_from_blockchain
-     if exclude_unique is not None:
-          payload['exclude_unique'] = exclude_unique
-     if sort_by_price is not None:
-          payload['sort_by_price'] = sort_by_price
-     if offset is not None:
-          payload['offset'] = offset
-     if limit is not None:
-          payload['limit'] = limit
-     return await _process_request(token, method_url, params=payload)
+                    exclude_limited_non_upgradable=None, exclude_from_blockchain=None, exclude_unique=None,
+                    sort_by_price=None, offset=None, limit=None):
+    method_url = 'getUserGifts'
+    payload = {'user_id': user_id}
+    if exclude_unlimited is not None:
+        payload['exclude_unlimited'] = exclude_unlimited
+    if exclude_limited_upgradable is not None:
+        payload['exclude_limited_upgradable'] = exclude_limited_upgradable
+    if exclude_limited_non_upgradable is not None:
+        payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
+    if exclude_from_blockchain is not None:
+        payload['exclude_from_blockchain'] = exclude_from_blockchain
+    if exclude_unique is not None:
+        payload['exclude_unique'] = exclude_unique
+    if sort_by_price is not None:
+        payload['sort_by_price'] = sort_by_price
+    if offset is None:
+        payload['offset'] = ""
+    else:
+        payload['offset'] = offset
+    if limit is not None:
+        payload['limit'] = limit
+    return await _process_request(token, method_url, params=payload)
 
 async def get_chat_gifts(token, chat_id, exclude_unsaved=None, exclude_saved=None,
                         exclude_unlimited=None, exclude_limited_upgradable=None,
                         exclude_limited_non_upgradable=None, exclude_from_blockchain=None,
                         exclude_unique=None, sort_by_price=None, offset=None, limit=None):
-        method_url = 'getChatGifts'
-        payload = {'chat_id': chat_id}
-        if exclude_unsaved is not None:
-                payload['exclude_unsaved'] = exclude_unsaved
-        if exclude_saved is not None:
-                payload['exclude_saved'] = exclude_saved
-        if exclude_unlimited is not None:
-                payload['exclude_unlimited'] = exclude_unlimited
-        if exclude_limited_upgradable is not None:
-                payload['exclude_limited_upgradable'] = exclude_limited_upgradable
-        if exclude_limited_non_upgradable is not None:
-                payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
-        if exclude_from_blockchain is not None:
-                payload['exclude_from_blockchain'] = exclude_from_blockchain
-        if exclude_unique is not None:
-                payload['exclude_unique'] = exclude_unique
-        if sort_by_price is not None:
-                payload['sort_by_price'] = sort_by_price
-        if offset is not None:
-                payload['offset'] = offset
-        if limit is not None:
-                payload['limit'] = limit
-        return await _process_request(token, method_url, params=payload)
+    method_url = 'getChatGifts'
+    payload = {'chat_id': chat_id}
+    if exclude_unsaved is not None:
+            payload['exclude_unsaved'] = exclude_unsaved
+    if exclude_saved is not None:
+            payload['exclude_saved'] = exclude_saved
+    if exclude_unlimited is not None:
+            payload['exclude_unlimited'] = exclude_unlimited
+    if exclude_limited_upgradable is not None:
+            payload['exclude_limited_upgradable'] = exclude_limited_upgradable
+    if exclude_limited_non_upgradable is not None:
+            payload['exclude_limited_non_upgradable'] = exclude_limited_non_upgradable
+    if exclude_from_blockchain is not None:
+            payload['exclude_from_blockchain'] = exclude_from_blockchain
+    if exclude_unique is not None:
+            payload['exclude_unique'] = exclude_unique
+    if sort_by_price is not None:
+            payload['sort_by_price'] = sort_by_price
+    if offset is None:
+        payload['offset'] = ""
+    else:
+        payload['offset'] = offset
+    if limit is not None:
+            payload['limit'] = limit
+    return await _process_request(token, method_url, params=payload)
 
 async def convert_gift_to_stars(token, business_connection_id, owned_gift_id):
     method_url = 'convertGiftToStars'

telebot/types.py

@@ -11679,29 +11679,25 @@ class AcceptedGiftTypes(JsonDeserializable, JsonSerializable):
     :return: Instance of the class
     :rtype: :class:`AcceptedGiftTypes`
     """
-    def __init__(self, unlimited_gifts: Optional[bool]=None, limited_gifts: Optional[bool]=None,
-                    unique_gifts: Optional[bool]=None, premium_subscription: Optional[bool]=None, gifts_from_channels: Optional[bool]=None, **kwargs):
-        self.unlimited_gifts: Optional[bool] = unlimited_gifts
-        self.limited_gifts: Optional[bool] = limited_gifts
-        self.unique_gifts: Optional[bool] = unique_gifts
-        self.premium_subscription: Optional[bool] = premium_subscription
-        self.gifts_from_channels: Optional[bool] = gifts_from_channels
+    def __init__(self, unlimited_gifts: Optional[bool], limited_gifts: Optional[bool],
+                    unique_gifts: Optional[bool], premium_subscription: Optional[bool], gifts_from_channels: Optional[bool], **kwargs):
+        self.unlimited_gifts: bool = unlimited_gifts
+        self.limited_gifts: bool = limited_gifts
+        self.unique_gifts: bool = unique_gifts
+        self.premium_subscription: bool = premium_subscription
+        self.gifts_from_channels: bool = gifts_from_channels
 
     def to_json(self):
         return json.dumps(self.to_dict())
 
     def to_dict(self):
-        data = {}
-        if self.unlimited_gifts is not None:
-            data['unlimited_gifts'] = self.unlimited_gifts
-        if self.limited_gifts is not None:
-            data['limited_gifts'] = self.limited_gifts
-        if self.unique_gifts is not None:
-            data['unique_gifts'] = self.unique_gifts
-        if self.premium_subscription is not None:
-            data['premium_subscription'] = self.premium_subscription
-        if self.gifts_from_channels is not None:
-            data['gifts_from_channels'] = self.gifts_from_channels
+        data = {
+            'unlimited_gifts': self.unlimited_gifts,
+            'limited_gifts': self.limited_gifts,
+            'unique_gifts': self.unique_gifts,
+            'premium_subscription': self.premium_subscription,
+            'gifts_from_channels': self.gifts_from_channels
+        }
         return data
 
     @classmethod
@@ -12641,7 +12637,7 @@ class UniqueGiftInfo(JsonDeserializable):
         after the gift was sent, or “offer” for gifts bought or sold through gift purchase offers
     :type origin: :obj:`str`
 
-    :param last_resale_star_count: Optional. For gifts bought from other users, the price paid for the gift
+    :param last_resale_star_count: Deprecated. Use last_resale_currency and last_resale_amount instead. 
     :type last_resale_star_count: :obj:`int`
 
     :param last_resale_currency: Optional. For gifts bought from other users, the currency in which the payment for the gift was done. Currently, one of “XTR” for Telegram Stars or “TON” for toncoins.
@@ -12664,17 +12660,24 @@ class UniqueGiftInfo(JsonDeserializable):
     """
     def __init__(self, gift: UniqueGift, origin: str, owned_gift_id: Optional[str] = None,
                     transfer_star_count: Optional[int] = None, next_transfer_date: Optional[int] = None,
-                    last_resale_star_count: Optional[int] = None, last_resale_currency: Optional[str] = None,
+                    last_resale_currency: Optional[str] = None,
                     last_resale_amount: Optional[int] = None, **kwargs):
         self.gift: UniqueGift = gift
         self.origin: str = origin
-        self.last_resale_star_count: Optional[int] = last_resale_star_count
         self.last_resale_currency: Optional[str] = last_resale_currency
         self.last_resale_amount: Optional[int] = last_resale_amount
         self.owned_gift_id: Optional[str] = owned_gift_id
         self.transfer_star_count: Optional[int] = transfer_star_count
         self.next_transfer_date: Optional[int] = next_transfer_date
 
+    @property 
+    def last_resale_star_count(self) -> Optional[int]:
+        """Deprecated. Use last_resale_currency and last_resale_amount instead."""
+        log_deprecation_warning("last_resale_star_count is deprecated. Use last_resale_currency and last_resale_amount instead.")
+        if self.last_resale_currency == "XTR":
+            return self.last_resale_amount
+        return None
+
 
     @classmethod
     def de_json(cls, json_string):

telebot/util.py

@@ -43,7 +43,7 @@
     'giveaway_created', 'giveaway_winners', 'giveaway_completed', 'boost_added', 'paid_message_price_changed',
     'checklist_tasks_done', 'checklist_tasks_added', 'direct_message_price_changed', 'suggested_post_refunded',
     'suggested_post_info', 'suggested_post_approved', 'suggested_post_approval_failed', 'suggested_post_declined',
-    'suggested_post_paid'
+    'suggested_post_paid', 'gift_upgrade_sent'
 ]
 
 #: All update types, should be used for allowed_updates parameter in polling.