Merge branch 'master' into inline_handler_update

Author: All-The-Foxes

README.md

@@ -10,7 +10,7 @@
 <p align="center">A simple, but extensible Python implementation for the <a href="https://core.telegram.org/bots/api">Telegram Bot API</a>.</p>
 <p align="center">Both synchronous and asynchronous.</p>
 
-## <p align="center">Supported Bot API version: <a href="https://core.telegram.org/bots/api#april-11-2025"><img src="https://img.shields.io/badge/Bot%20API-9.0-blue?logo=telegram" alt="Supported Bot API version"></a>
+## <p align="center">Supported Bot API version: <a href="https://core.telegram.org/bots/api#july-3-2025"><img src="https://img.shields.io/badge/Bot%20API-9.1-blue?logo=telegram" alt="Supported Bot API version"></a>
 
 <h2><a href='https://pytba.readthedocs.io/en/latest/index.html'>Official documentation</a></h2>
 <h2><a href='https://pytba.readthedocs.io/ru/latest/index.html'>Official ru documentation</a></h2>

docs/source/conf.py

@@ -22,7 +22,7 @@
 copyright = f'2022-{datetime.now().year}, {author}'
 
 # The full version, including alpha/beta/rc tags
-release = '4.27.0'
+release = '4.28.0'
 
 
 # -- General configuration ---------------------------------------------------

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyTelegramBotAPI"
-version = "4.27.0"
+version = "4.28.0"
 description = "Python Telegram bot api."
 authors = [{name = "eternnoir", email = "eternnoir@gmail.com"}]
 license = {text = "GPL2"}
@@ -35,7 +35,6 @@ Issues = "https://github.com/eternnoir/pyTelegramBotAPI/issues"
 json = ["ujson"]
 PIL = ["Pillow"]
 redis = ["redis>=3.4.1"]
-aiohttp = ["aiohttp"]
 fastapi = ["fastapi"]
 uvicorn = ["uvicorn"]
 psutil = ["psutil"]

requirements.txt

@@ -1,4 +1,4 @@
 pytest
 requests==2.32.4
 wheel==0.38.1
-aiohttp==3.10.11
+aiohttp==3.12.14

telebot/apihelper.py

@@ -168,6 +168,8 @@ def _make_request(token, method_name, method='get', params=None, files=None):
     json_result = _check_result(method_name, result)
     if json_result:
         return json_result['result']
+    else:
+        return None
 
 
 def _check_result(method_name, result):
@@ -1139,8 +1141,10 @@ def send_data(token, chat_id, data, data_type, reply_markup=None, parse_mode=Non
 def get_method_by_type(data_type):
     if data_type == 'document':
         return r'sendDocument'
-    if data_type == 'sticker':
+    elif data_type == 'sticker':
         return r'sendSticker'
+    else:
+        raise ValueError(f"Unsupported data type: {data_type}.")
 
 
 def ban_chat_member(token, chat_id, user_id, until_date=None, revoke_messages=None):
@@ -2524,6 +2528,7 @@ def convert_input_media_array(array):
     for input_media in array:
         if isinstance(input_media, types.InputMedia) or isinstance(input_media, types.InputPaidMedia):
             media_dict = input_media.to_dict()
+            key = "x" # stub
             if media_dict['media'].startswith('attach://'):
                 key = media_dict['media'].replace('attach://', '')
                 files[key] = input_media.media

telebot/util.py

@@ -27,29 +27,30 @@
 
 #: Contains all media content types.
 content_type_media = [
-    'text', 'animation', 'audio', 'document', 'photo', 'sticker', 'story', 'video', 'video_note', 'voice', 'contact',
-    'dice', 'game', 'poll', 'venue', 'location',  'invoice', 'successful_payment', 'connected_website',
-    'passport_data', 'web_app_data',
+    'text', 'audio', 'document', 'animation', 'game', 'photo', 'sticker', 'video', 'video_note', 'voice', 'contact',
+    'location', 'venue', 'dice', 'invoice', 'successful_payment', 'connected_website', 'poll', 'passport_data',
+    'web_app_data', 'story', 'giveaway', 'gift', 'unique_gift',
 ]
 
 #: Contains all service content types such as `User joined the group`.
 content_type_service = [
     'new_chat_members', 'left_chat_member', 'new_chat_title', 'new_chat_photo', 'delete_chat_photo',
-    'group_chat_created', 'supergroup_chat_created', 'channel_chat_created', 'message_auto_delete_timer_changed',
-    'migrate_to_chat_id', 'migrate_from_chat_id', 'pinned_message', 'users_shared', 'chat_shared',
-    'write_access_allowed', 'proximity_alert_triggered', 'forum_topic_created', 'forum_topic_edited',
-    'forum_topic_closed', 'forum_topic_reopened', 'general_forum_topic_hidden', 'general_forum_topic_unhidden',
-    'giveaway_created', 'giveaway', 'giveaway_winners', 'giveaway_completed', 'video_chat_scheduled',
-    'video_chat_started', 'video_chat_ended', 'video_chat_participants_invited','checklist_tasks_done',
-    'checklist_tasks_added','direct_message_price_changed'
+    'group_chat_created', 'supergroup_chat_created', 'channel_chat_created', 'migrate_to_chat_id',
+    'migrate_from_chat_id', 'pinned_message', 'proximity_alert_triggered', 'video_chat_scheduled',
+    'video_chat_started', 'video_chat_ended', 'video_chat_participants_invited', 'message_auto_delete_timer_changed',
+    'chat_background_set', 'forum_topic_created', 'forum_topic_closed', 'forum_topic_reopened', 'forum_topic_edited',
+    'general_forum_topic_hidden', 'general_forum_topic_unhidden', 'write_access_allowed', 'users_shared', 'chat_shared',
+    'giveaway_created', 'giveaway_winners', 'giveaway_completed', 'boost_added', 'paid_message_price_changed',
+    'checklist_tasks_done', 'checklist_tasks_added', 'direct_message_price_changed',
 ]
 
 #: All update types, should be used for allowed_updates parameter in polling.
 update_types = [
     "message", "edited_message", "channel_post", "edited_channel_post", "inline_query", "chosen_inline_result",
     "callback_query", "shipping_query", "pre_checkout_query", "poll", "poll_answer", "my_chat_member", "chat_member",
-    "chat_join_request", "message_reaction", "message_reaction_count", "chat_boost", "removed_chat_boost",
-    "business_connection", "business_message", "edited_business_message", "deleted_business_messages", "purchased_paid_media"
+    "chat_join_request", "message_reaction", "message_reaction_count", "removed_chat_boost", "chat_boost",
+    "business_connection", "business_message", "edited_business_message", "deleted_business_messages",
+    "purchased_paid_media",
 ]
 
 

telebot/version.py

@@ -1,3 +1,3 @@
 # Versions should comply with PEP440.
 # This line is parsed in setup.py:
-__version__ = '4.27.0'
+__version__ = '4.28.0'

tests/test_types.py

@@ -242,13 +242,13 @@ def test_json_chat_invite_link():
 
 
 def test_chat_member_updated():
-    json_string = r'{"chat": {"id": -1234567890123, "type": "supergroup", "title": "No Real Group", "username": "NoRealGroup"}, "from": {"id": 133869498, "is_bot": false, "first_name": "Vincent"}, "date": 1624119999, "old_chat_member": {"user": {"id": 77777777, "is_bot": false, "first_name": "Pepe"}, "status": "member"}, "new_chat_member": {"user": {"id": 77777777, "is_bot": false, "first_name": "Pepe"}, "status": "administrator"}}'
+    json_string = r'{"chat": {"id": -1234567890123, "type": "supergroup", "title": "No Real Group", "username": "NoRealGroup"}, "from": {"id": 133869498, "is_bot": false, "first_name": "Vincent"}, "date": 1624119999, "old_chat_member": {"user": {"id": 77777777, "is_bot": false, "first_name": "Pepe"}, "status": "member"}, "new_chat_member": {"user": {"id": 77777777, "is_bot": false, "first_name": "Pepe"}, "status": "left"}}'
     cm_updated = types.ChatMemberUpdated.de_json(json_string)
     assert cm_updated.chat.id == -1234567890123
     assert cm_updated.from_user.id == 133869498
     assert cm_updated.date == 1624119999
     assert cm_updated.old_chat_member.status == "member"
-    assert cm_updated.new_chat_member.status == "administrator"
+    assert cm_updated.new_chat_member.status == "left"
 
 
 def test_webhook_info():
@@ -309,5 +309,3 @@ def test_message_entity():
     sample_string_7 = r'{"update_id":934522167,"message":{"message_id":1374526,"from":{"id":927266710,"is_bot":false,"first_name":">_run","username":"coder2020","language_code":"en","is_premium":true},"chat":{"id":927266710,"first_name":">_run","username":"coder2020","type":"private"},"date":1682179716,"reply_to_message":{"message_id":1374510,"from":{"id":927266710,"is_bot":false,"first_name":">_run","username":"coder2020","language_code":"en"},"chat":{"id":927266710,"first_name":">_run","username":"coder2020","type":"private"},"date":1712765863,"text":"text @UserName b i s u c p #hashtag https://example.com","entities":[{"offset":5,"length":9,"type":"mention"},{"offset":15,"length":1,"type":"bold"},{"offset":17,"length":1,"type":"italic"},{"offset":19,"length":1,"type":"strikethrough"},{"offset":21,"length":1,"type":"underline"},{"offset":23,"length":1,"type":"code"},{"offset":25,"length":1,"type":"spoiler"},{"offset":27,"length":8,"type":"hashtag"},{"offset":36,"length":19,"type":"url"}],"link_preview_options":{"is_disabled":true}},"quote":{"text":"text @UserName b i s u c p #hashtag https://example.com","entities":[{"offset":15,"length":1,"type":"bold"},{"offset":17,"length":1,"type":"italic"},{"offset":19,"length":1,"type":"strikethrough"},{"offset":21,"length":1,"type":"underline"},{"offset":25,"length":1,"type":"spoiler"}],"position":0,"is_manual":true},"text":"quote reply"}}'
     message_7 = types.Update.de_json(sample_string_7).message
     assert message_7.quote.html_text == 'text @UserName <b>b</b> <i>i</i> <s>s</s> <u>u</u> c <span class="tg-spoiler">p</span> #hashtag https://example.com'
-
-