python-telegram-bot · Bibo-Joshi · Jan 3, 2022 · Dec 31, 2021 · Dec 31, 2021 · Dec 31, 2021
diff --git a/README.rst b/README.rst
@@ -20,7 +20,7 @@ We have a vibrant community of developers helping each other in our `Telegram gr
    :target: https://pypi.org/project/python-telegram-bot/
    :alt: Supported Python versions
 
-.. image:: https://img.shields.io/badge/Bot%20API-5.5-blue?logo=telegram
+.. image:: https://img.shields.io/badge/Bot%20API-5.6-blue?logo=telegram
    :target: https://core.telegram.org/bots/api-changelog
    :alt: Supported Bot API versions
 
@@ -111,7 +111,7 @@ Installing both ``python-telegram-bot`` and ``python-telegram-bot-raw`` in conju
 Telegram API support
 ====================
 
-All types and methods of the Telegram Bot API **5.5** are supported.
+All types and methods of the Telegram Bot API **5.6** are supported.
 
 ==========
 Installing

diff --git a/README_RAW.rst b/README_RAW.rst
@@ -20,7 +20,7 @@ We have a vibrant community of developers helping each other in our `Telegram gr
    :target: https://pypi.org/project/python-telegram-bot-raw/
    :alt: Supported Python versions
 
-.. image:: https://img.shields.io/badge/Bot%20API-5.5-blue?logo=telegram
+.. image:: https://img.shields.io/badge/Bot%20API-5.6-blue?logo=telegram
    :target: https://core.telegram.org/bots/api-changelog
    :alt: Supported Bot API versions
 
@@ -105,7 +105,7 @@ Installing both ``python-telegram-bot`` and ``python-telegram-bot-raw`` in conju
 Telegram API support
 ====================
 
-All types and methods of the Telegram Bot API **5.5** are supported.
+All types and methods of the Telegram Bot API **5.6** are supported.
 
 ==========
 Installing

diff --git a/telegram/bot.py b/telegram/bot.py
@@ -306,10 +306,14 @@ def _message(
         allow_sending_without_reply: ODVInput[bool] = DEFAULT_NONE,
         timeout: ODVInput[float] = DEFAULT_NONE,
         api_kwargs: JSONDict = None,
+        protect_content: bool = None,
     ) -> Union[bool, Message]:
         if reply_to_message_id is not None:
             data['reply_to_message_id'] = reply_to_message_id
 
+        if protect_content:
+            data['protect_content'] = protect_content
+
         # We don't check if (DEFAULT_)None here, so that _put is able to insert the defaults
         # correctly, if necessary
         data['disable_notification'] = disable_notification
@@ -515,9 +519,6 @@ def send_message(
         if entities:
             data['entities'] = [me.to_dict() for me in entities]
 
-        if protect_content:
-            data['protect_content'] = protect_content
-
         return self._message(  # type: ignore[return-value]
             'sendMessage',
             data,
@@ -527,6 +528,7 @@ def send_message(
             allow_sending_without_reply=allow_sending_without_reply,
             timeout=timeout,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -630,14 +632,13 @@ def forward_message(
             data['from_chat_id'] = from_chat_id
         if message_id:
             data['message_id'] = message_id
-        if protect_content:
-            data['protect_content'] = protect_content
         return self._message(  # type: ignore[return-value]
             'forwardMessage',
             data,
             disable_notification=disable_notification,
             timeout=timeout,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -725,9 +726,6 @@ def send_photo(
         if caption_entities:
             data['caption_entities'] = [me.to_dict() for me in caption_entities]
 
-        if protect_content:
-            data['protect_content'] = protect_content
-
         return self._message(  # type: ignore[return-value]
             'sendPhoto',
             data,
@@ -737,6 +735,7 @@ def send_photo(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -854,8 +853,6 @@ def send_audio(
             data['caption_entities'] = [me.to_dict() for me in caption_entities]
         if thumb:
             data['thumb'] = parse_file_input(thumb, attach=True)
-        if protect_content:
-            data['protect_content'] = None
 
         return self._message(  # type: ignore[return-value]
             'sendAudio',
@@ -866,6 +863,7 @@ def send_audio(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -971,8 +969,6 @@ def send_document(
             data['disable_content_type_detection'] = disable_content_type_detection
         if thumb:
             data['thumb'] = parse_file_input(thumb, attach=True)
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendDocument',
@@ -983,6 +979,7 @@ def send_document(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1044,9 +1041,6 @@ def send_sticker(
         """
         data: JSONDict = {'chat_id': chat_id, 'sticker': parse_file_input(sticker, Sticker)}
 
-        if protect_content:
-            data['protect_content'] = protect_content
-
         return self._message(  # type: ignore[return-value]
             'sendSticker',
             data,
@@ -1056,6 +1050,7 @@ def send_sticker(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1178,8 +1173,6 @@ def send_video(
             data['height'] = height
         if thumb:
             data['thumb'] = parse_file_input(thumb, attach=True)
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendVideo',
@@ -1190,6 +1183,7 @@ def send_video(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1285,8 +1279,6 @@ def send_video_note(
             data['length'] = length
         if thumb:
             data['thumb'] = parse_file_input(thumb, attach=True)
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendVideoNote',
@@ -1297,6 +1289,7 @@ def send_video_note(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1410,8 +1403,6 @@ def send_animation(
             data['caption'] = caption
         if caption_entities:
             data['caption_entities'] = [me.to_dict() for me in caption_entities]
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendAnimation',
@@ -1422,6 +1413,7 @@ def send_animation(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1517,9 +1509,6 @@ def send_voice(
         if caption_entities:
             data['caption_entities'] = [me.to_dict() for me in caption_entities]
 
-        if protect_content:
-            data['protect_content'] = protect_content
-
         return self._message(  # type: ignore[return-value]
             'sendVoice',
             data,
@@ -1529,6 +1518,7 @@ def send_voice(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1688,8 +1678,6 @@ def send_location(
             data['heading'] = heading
         if proximity_alert_radius:
             data['proximity_alert_radius'] = proximity_alert_radius
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendLocation',
@@ -1700,6 +1688,7 @@ def send_location(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -1947,8 +1936,6 @@ def send_venue(
             data['google_place_id'] = google_place_id
         if google_place_type:
             data['google_place_type'] = google_place_type
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendVenue',
@@ -1959,6 +1946,7 @@ def send_venue(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -2041,8 +2029,6 @@ def send_contact(
             data['last_name'] = last_name
         if vcard:
             data['vcard'] = vcard
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendContact',
@@ -2053,6 +2039,7 @@ def send_contact(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -2103,9 +2090,6 @@ def send_game(
         """
         data: JSONDict = {'chat_id': chat_id, 'game_short_name': game_short_name}
 
-        if protect_content:
-            data['protect_content'] = protect_content
-
         return self._message(  # type: ignore[return-value]
             'sendGame',
             data,
@@ -2115,6 +2099,7 @@ def send_game(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -3771,8 +3756,6 @@ def send_invoice(
             data['send_phone_number_to_provider'] = send_phone_number_to_provider
         if send_email_to_provider is not None:
             data['send_email_to_provider'] = send_email_to_provider
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendInvoice',
@@ -3783,6 +3766,7 @@ def send_invoice(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -5246,8 +5230,6 @@ def send_poll(
                     close_date, tzinfo=self.defaults.tzinfo if self.defaults else None
                 )
             data['close_date'] = close_date
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendPoll',
@@ -5258,6 +5240,7 @@ def send_poll(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log
@@ -5363,8 +5346,6 @@ def send_dice(
 
         if emoji:
             data['emoji'] = emoji
-        if protect_content:
-            data['protect_content'] = protect_content
 
         return self._message(  # type: ignore[return-value]
             'sendDice',
@@ -5375,6 +5356,7 @@ def send_dice(
             reply_markup=reply_markup,
             allow_sending_without_reply=allow_sending_without_reply,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
 
     @log

diff --git a/telegram/constants.py b/telegram/constants.py
@@ -21,7 +21,7 @@
 `Telegram Bots API <https://core.telegram.org/bots/api>`_.
 
 Attributes:
-    BOT_API_VERSION (:obj:`str`): `5.5`. Telegram Bot API version supported by this
+    BOT_API_VERSION (:obj:`str`): `5.6`. Telegram Bot API version supported by this
         version of `python-telegram-bot`. Also available as ``telegram.bot_api_version``.
 
         .. versionadded:: 13.4
@@ -141,6 +141,9 @@
     MESSAGEENTITY_TEXT_MENTION (:obj:`str`): ``'text_mention'``
     MESSAGEENTITY_UNDERLINE (:obj:`str`): ``'underline'``
     MESSAGEENTITY_STRIKETHROUGH (:obj:`str`): ``'strikethrough'``
+    MESSAGEENTITY_SPOILER (:obj:`str`): ``'spoiler'``
+
+        .. versionadded:: 13.10
     MESSAGEENTITY_ALL_TYPES (List[:obj:`str`]): List of all the types of message entity.
 
 :class:`telegram.ParseMode`:
@@ -244,7 +247,7 @@
 """
 from typing import List
 
-BOT_API_VERSION: str = '5.5'
+BOT_API_VERSION: str = '5.6'
 MAX_MESSAGE_LENGTH: int = 4096
 MAX_CAPTION_LENGTH: int = 1024
 ANONYMOUS_ADMIN_ID: int = 1087968824

diff --git a/telegram/ext/extbot.py b/telegram/ext/extbot.py
@@ -193,6 +193,7 @@ def _message(
         allow_sending_without_reply: ODVInput[bool] = DEFAULT_NONE,
         timeout: ODVInput[float] = DEFAULT_NONE,
         api_kwargs: JSONDict = None,
+        protect_content: bool = None,
     ) -> Union[bool, Message]:
         # We override this method to call self._replace_keyboard and self._insert_callback_data.
         # This covers most methods that have a reply_markup
@@ -205,6 +206,7 @@ def _message(
             allow_sending_without_reply=allow_sending_without_reply,
             timeout=timeout,
             api_kwargs=api_kwargs,
+            protect_content=protect_content,
         )
         if isinstance(result, Message):
             self._insert_callback_data(result)