Bump version to v13.8

API 5.4 (#2767 )
Co-authored-by: poolitzer <25934244+Poolitzer@users.noreply.github.com>
2026-06-21 00:25:42 +00:00 · 2021-11-08 19:12:10 +01:00 · 2021-11-08 19:02:20 +01:00 · 2021-10-03 20:08:04 +02:00 · 2021-09-15 17:07:11 +02:00 · 2021-09-09 07:50:04 +02:00
36 changed files with 1444 additions and 142 deletions
@@ -0,0 +1,76 @@
+name: Bug Report
+description: Create a report to help us improve
+title: "[BUG]"
+labels: ["bug :bug:"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for reporting issues of python-telegram-bot!
+
+        Use this template to notify us if you found a bug.
+
+        To make it easier for us to help you please enter detailed information below.
+
+        Please note, we only support the latest version of python-telegram-bot and master branch. Please make sure to upgrade & recreate the issue on the latest version prior to opening an issue.
+      
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      value: |
+        1. 
+        2.
+        3.
+    validations:
+      required: true
+        
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: Expected behaviour
+      description: Tell us what should happen
+    validations:
+      required: true
+      
+  - type: textarea
+    id: actual-behaviour
+    attributes:
+      label: Actual behaviour
+      description: Tell us what happens instead
+    validations:
+      required: true
+      
+  - type: markdown
+    attributes:
+      value: "### Configuration"
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+    validations: 
+      required: true
+
+  - type: textarea
+    id: versions
+    attributes:
+      label: Version of Python, python-telegram-bot & dependencies
+      description: Paste the output of `$ python -m telegram` here. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations: 
+      required: true
+      
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Insert logs here (if necessary). This will be automatically formatted into code, so no need for backticks.
+      render: python
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: You may provide any other additional context to the bug here.
@@ -1,43 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: 'bug :bug:'
-assignees: ''
-
---
-
-<!--
-Thanks for reporting issues of python-telegram-bot!
-
-Use this template to notify us if you found a bug.
-
-To make it easier for us to help you please enter detailed information below.
-
-Please note, we only support the latest version of python-telegram-bot and
-master branch. Please make sure to upgrade & recreate the issue on the latest
-version prior to opening an issue.
-->
-### Steps to reproduce
-1.
-
-2.
-
-3.
-
-### Expected behaviour
-Tell us what should happen
-
-### Actual behaviour
-Tell us what happens instead
-
-### Configuration
-**Operating System:**
-
-
-**Version of Python, python-telegram-bot & dependencies:**
-
-``$ python -m telegram``
-
-### Logs
-Insert logs here (if necessary)
@@ -0,0 +1,37 @@
+name: Feature Request
+description: Suggest an idea for this project
+title: "[FEATURE]"
+labels: ["enhancement"]
+
+body:
+  - type: textarea
+    id: related-problem
+    attributes:
+      label: "What kind of feature are you missing? Where do you notice a shortcoming of PTB?"
+      description: "A clear and concise description of what the problem is."
+      placeholder: "Example: I want to do X, but there is no way to do it."
+    validations:
+      required: true
+      
+  - type: textarea
+    id: solution
+    attributes:
+      label: "Describe the solution you'd like"
+      description: "A clear and concise description of what you want to happen."
+      placeholder: "Example: I think it would be nice if you would add feature Y so I can do X."
+    validations:
+      required: true
+        
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: "Describe alternatives you've considered"
+      description: "A clear and concise description of any alternative solutions or features you've considered."
+      placeholder: "Example: I considered Z to be able to do X, but that didn't work because..."
+      
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: "Additional context"
+      description: "Add any other context or screenshots about the feature request here."
+      placeholder: "Example: Here's a photo of my cat!"
@@ -1,24 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE]"
-labels: enhancement
-assignees: ''
-
---
-
-#### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is.
-Ex. *I want to do X, but there is no way to do it.*
-
-#### Describe the solution you'd like
-A clear and concise description of what you want to happen.
-Ex. *I think it would be nice if you would add feature Y so it will make it easier.*
-
-#### Describe alternatives you've considered
-A clear and concise description of any alternative solutions or features you've considered.
-Ex. *I considered Z, but that didn't work because...*
-
-#### Additional context
-Add any other context or screenshots about the feature request here.
-Ex. *Here's a photo of my cat!*
@@ -1,29 +0,0 @@
---
-name: Question
-about: Get help with errors or general questions
-title: "[QUESTION]"
-labels: question
-assignees: ''
-
---
-
-<!--
-Hey there, you have a question? We are happy to answer. Please make sure no similar question was opened already.
-
-To make it easier for us to help you, please read this article https://git.io/JURJO and try to follow the template below as closely as possible.
-
-Please mind that there is also a users' Telegram group at https://t.me/pythontelegrambotgroup for questions about the library. Questions asked there might be answered quicker than here. Moreover, GitHub Discussions at https://git.io/JG3rk offer a slightly better format to discuss usage questions.
-->
-
-### Issue I am facing
-Please describe the issue here in as much detail as possible
-
-### Traceback to the issue
-```
-put it here
-```
-
-### Related part of your code
-```python
-put it here
-```
@@ -0,0 +1,68 @@
+name: Question
+description: Get help with errors or general questions
+title: "[QUESTION]"
+labels: ["question"]
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Hey there, you have a question? We are happy to answer. Please make sure no similar question was opened already.
+
+        To make it easier for us to help you, please read this [article](https://git.io/JURJO).
+
+        Please mind that there is also a users' [Telegram group](https://t.me/pythontelegrambotgroup) for questions about the library. Questions asked there might be answered quicker than here. Moreover, [GitHub Discussions](https://git.io/JG3rk) offer a slightly better format to discuss usage questions.
+
+  - type: textarea
+    id: issue-faced
+    attributes:
+      label: "Issue I am facing"
+      description: "Please describe the issue here in as much detail as possible"
+    validations:
+      required: true
+      
+  - type: textarea
+    id: traceback
+    attributes:
+      label: "Traceback to the issue"
+      description: "If you are facing a specific error message, please paste the traceback here. This will be automatically formatted into python code, so no need for backticks."
+      placeholder: |
+        Traceback (most recent call last):
+          File "/home/bot.py", line 1, in main
+            foo = bar()
+          ...
+        telegram.error.BadRequest: Traceback not found
+      render: python
+        
+  - type: textarea
+    id: related-code
+    attributes:
+      label: "Related part of your code"
+      description: "This will be automatically formatted into code (python), so no need for backticks."
+      placeholder: |
+        logging.basicConfig(
+            format="%(asctime)s - %(name)s - %(levelname)s - %(message)s", level=logging.INFO
+        )
+
+        logger = logging.getLogger(__name__)
+      render: python
+
+  - type: markdown
+    attributes:
+      value: "### Configuration"
+
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+    validations: 
+      required: true
+      
+  - type: textarea
+    id: versions
+    attributes:
+      label: Version of Python, python-telegram-bot & dependencies
+      description: Paste the output of `$ python -m telegram` here. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+    validations: 
+      required: true
@@ -26,6 +26,7 @@ Contributors

 The following wonderful people contributed directly or indirectly to this project:

+- `Abshar <https://github.com/abxhr>`_
 - `Alateas <https://github.com/alateas>`_
 - `Ales Dokshanin <https://github.com/alesdokshanin>`_
 - `Ambro17 <https://github.com/Ambro17>`_
@@ -39,6 +40,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `daimajia <https://github.com/daimajia>`_
 - `Daniel Reed <https://github.com/nmlorg>`_
 - `D David Livingston <https://github.com/daviddl9>`_
+- `DonalDuck004 <https://github.com/DonalDuck004>`_
 - `Eana Hufwe <https://github.com/blueset>`_
 - `Ehsan Online <https://github.com/ehsanonline>`_
 - `Eli Gao <https://github.com/eligao>`_
@@ -84,6 +86,7 @@ The following wonderful people contributed directly or indirectly to this projec
 - `Oleg Sushchenko <https://github.com/feuillemorte>`_
 - `Or Bin <https://github.com/OrBin>`_
 - `overquota <https://github.com/overquota>`_
+- `Paradox <https://github.com/paradox70>`_
 - `Patrick Hofmann <https://github.com/PH89>`_
 - `Paul Larsen <https://github.com/PaulSonOfLars>`_
 - `Pieter Schutz <https://github.com/eldinnie>`_
@@ -2,6 +2,31 @@
 Changelog
 =========

+Version 13.8
+============
+*Released 2021-11-08*
+
+This is the technical changelog for version 13.8. More elaborate release notes can be found in the news channel `@pythontelegrambotchannel <https://t.me/pythontelegrambotchannel>`_.
+
+**Major Changes:**
+
+- Full support for API 5.4 (`#2767`_)
+
+**Minor changes, CI improvements, Doc fixes and Type hinting:**
+
+- Create Issue Template Forms (`#2689`_)
+- Fix ``camelCase`` Functions in ``ExtBot`` (`#2659`_)
+- Fix Empty Captions not Being Passed by ``Bot.copy_message`` (`#2651`_)
+- Fix Setting Thumbs When Uploading A Single File (`#2583`_)
+- Fix Bug in ``BasePersistence.insert``/``replace_bot`` for Objects with ``__dict__`` not in ``__slots__`` (`#2603`_)
+
+.. _`#2767`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2767
+.. _`#2689`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2689
+.. _`#2659`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2659
+.. _`#2651`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2651
+.. _`#2583`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2583
+.. _`#2603`: https://github.com/python-telegram-bot/python-telegram-bot/pull/2603
+
 Version 13.7
 ============
 *Released 2021-07-01*
@@ -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.3-blue?logo=telegram
+.. image:: https://img.shields.io/badge/Bot%20API-5.4-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.3** are supported.
+All types and methods of the Telegram Bot API **5.4** are supported.

 ==========
 Installing
@@ -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.3-blue?logo=telegram
+.. image:: https://img.shields.io/badge/Bot%20API-5.4-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.3** are supported.
+All types and methods of the Telegram Bot API **5.4** are supported.

 ==========
 Installing
@@ -60,9 +60,9 @@ author = u'Leandro Toledo'
 # built documents.
 #
 # The short X.Y version.
-version = '13.7'  # telegram.__version__[:3]
+version = '13.8'  # telegram.__version__[:3]
 # The full version, including alpha/beta/rc tags.
-release = '13.7'  # telegram.__version__
+release = '13.8'  # telegram.__version__

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -60,7 +60,7 @@ ignore_errors = True

 # Disable strict optional for telegram objects with class methods
 # We don't want to clutter the code with 'if self.bot is None: raise RuntimeError()'
-[mypy-telegram.callbackquery,telegram.chat,telegram.message,telegram.user,telegram.files.*,telegram.inline.inlinequery,telegram.payment.precheckoutquery,telegram.payment.shippingquery,telegram.passport.passportdata,telegram.passport.credentials,telegram.passport.passportfile,telegram.ext.filters]
+[mypy-telegram.callbackquery,telegram.chat,telegram.message,telegram.user,telegram.files.*,telegram.inline.inlinequery,telegram.payment.precheckoutquery,telegram.payment.shippingquery,telegram.passport.passportdata,telegram.passport.credentials,telegram.passport.passportfile,telegram.ext.filters,telegram.chatjoinrequest]
 strict_optional = False

 # type hinting for asyncio in webhookhandler is a bit tricky because it depends on the OS
@@ -25,6 +25,7 @@ from .files.chatphoto import ChatPhoto
 from .chat import Chat
 from .chatlocation import ChatLocation
 from .chatinvitelink import ChatInviteLink
+from .chatjoinrequest import ChatJoinRequest
 from .chatmember import (
    ChatMember,
    ChatMemberOwner,
@@ -194,6 +195,7 @@ __all__ = (  # Keep this alphabetically ordered
    'Chat',
    'ChatAction',
    'ChatInviteLink',
+    'ChatJoinRequest',
    'ChatLocation',
    'ChatMember',
    'ChatMemberOwner',
@@ -3985,6 +3985,8 @@ class Bot(TelegramObject):
        member_limit: int = None,
        timeout: ODVInput[float] = DEFAULT_NONE,
        api_kwargs: JSONDict = None,
+        name: str = None,
+        creates_join_request: bool = None,
    ) -> ChatInviteLink:
        """
        Use this method to create an additional invite link for a chat. The bot must be an
@@ -4007,6 +4009,14 @@ class Bot(TelegramObject):
                the connection pool).
            api_kwargs (:obj:`dict`, optional): Arbitrary keyword arguments to be passed to the
                Telegram API.
+            name (:obj:`str`, optional): Invite link name; 0-32 characters.
+
+                .. versionadded:: 13.8
+            creates_join_request (:obj:`bool`, optional): :obj:`True`, if users joining the chat
+                via the link need to be approved by chat administrators.
+                If :obj:`True`, ``member_limit`` can't be specified.
+
+                .. versionadded:: 13.8

        Returns:
            :class:`telegram.ChatInviteLink`
@@ -4015,6 +4025,11 @@ class Bot(TelegramObject):
            :class:`telegram.error.TelegramError`

        """
+        if creates_join_request and member_limit:
+            raise ValueError(
+                "If `creates_join_request` is `True`, `member_limit` can't be specified."
+            )
+
        data: JSONDict = {
            'chat_id': chat_id,
        }
@@ -4029,6 +4044,12 @@ class Bot(TelegramObject):
        if member_limit is not None:
            data['member_limit'] = member_limit

+        if name is not None:
+            data['name'] = name
+
+        if creates_join_request is not None:
+            data['creates_join_request'] = creates_join_request
+
        result = self._post('createChatInviteLink', data, timeout=timeout, api_kwargs=api_kwargs)

        return ChatInviteLink.de_json(result, self)  # type: ignore[return-value, arg-type]
@@ -4042,11 +4063,19 @@ class Bot(TelegramObject):
        member_limit: int = None,
        timeout: ODVInput[float] = DEFAULT_NONE,
        api_kwargs: JSONDict = None,
+        name: str = None,
+        creates_join_request: bool = None,
    ) -> ChatInviteLink:
        """
        Use this method to edit a non-primary invite link created by the bot. The bot must be an
        administrator in the chat for this to work and must have the appropriate admin rights.

+        Note:
+            Though not stated explicitly in the official docs, Telegram changes not only the
+            optional parameters that are explicitly passed, but also replaces all other optional
+            parameters to the default values. However, since not documented, this behaviour may
+            change unbeknown to PTB.
+
        .. versionadded:: 13.4

        Args:
@@ -4064,6 +4093,14 @@ class Bot(TelegramObject):
                the connection pool).
            api_kwargs (:obj:`dict`, optional): Arbitrary keyword arguments to be passed to the
                Telegram API.
+            name (:obj:`str`, optional): Invite link name; 0-32 characters.
+
+                .. versionadded:: 13.8
+            creates_join_request (:obj:`bool`, optional): :obj:`True`, if users joining the chat
+                via the link need to be approved by chat administrators.
+                If :obj:`True`, ``member_limit`` can't be specified.
+
+                .. versionadded:: 13.8

        Returns:
            :class:`telegram.ChatInviteLink`
@@ -4072,6 +4109,11 @@ class Bot(TelegramObject):
            :class:`telegram.error.TelegramError`

        """
+        if creates_join_request and member_limit:
+            raise ValueError(
+                "If `creates_join_request` is `True`, `member_limit` can't be specified."
+            )
+
        data: JSONDict = {'chat_id': chat_id, 'invite_link': invite_link}

        if expire_date is not None:
@@ -4084,6 +4126,12 @@ class Bot(TelegramObject):
        if member_limit is not None:
            data['member_limit'] = member_limit

+        if name is not None:
+            data['name'] = name
+
+        if creates_join_request is not None:
+            data['creates_join_request'] = creates_join_request
+
        result = self._post('editChatInviteLink', data, timeout=timeout, api_kwargs=api_kwargs)

        return ChatInviteLink.de_json(result, self)  # type: ignore[return-value, arg-type]
@@ -4126,6 +4174,80 @@ class Bot(TelegramObject):

        return ChatInviteLink.de_json(result, self)  # type: ignore[return-value, arg-type]

+    @log
+    def approve_chat_join_request(
+        self,
+        chat_id: Union[str, int],
+        user_id: int,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Use this method to approve a chat join request.
+
+        The bot must be an administrator in the chat for this to work and must have the
+        :attr:`telegram.ChatPermissions.can_invite_users` administrator right.
+
+        .. versionadded:: 13.8
+
+        Args:
+            chat_id (:obj:`int` | :obj:`str`): Unique identifier for the target chat or username
+                of the target channel (in the format ``@channelusername``).
+            user_id (:obj:`int`): Unique identifier of the target user.
+            timeout (:obj:`int` | :obj:`float`, optional): If this value is specified, use it as
+                the read timeout from the server (instead of the one specified during creation of
+                the connection pool).
+            api_kwargs (:obj:`dict`, optional): Arbitrary keyword arguments to be passed to the
+                Telegram API.
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        Raises:
+            :class:`telegram.error.TelegramError`
+        """
+        data: JSONDict = {'chat_id': chat_id, 'user_id': user_id}
+
+        result = self._post('approveChatJoinRequest', data, timeout=timeout, api_kwargs=api_kwargs)
+
+        return result  # type: ignore[return-value]
+
+    @log
+    def decline_chat_join_request(
+        self,
+        chat_id: Union[str, int],
+        user_id: int,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Use this method to decline a chat join request.
+
+        The bot must be an administrator in the chat for this to work and must have the
+        :attr:`telegram.ChatPermissions.can_invite_users` administrator right.
+
+        .. versionadded:: 13.8
+
+        Args:
+            chat_id (:obj:`int` | :obj:`str`): Unique identifier for the target chat or username
+                of the target channel (in the format ``@channelusername``).
+            user_id (:obj:`int`): Unique identifier of the target user.
+            timeout (:obj:`int` | :obj:`float`, optional): If this value is specified, use it as
+                the read timeout from the server (instead of the one specified during creation of
+                the connection pool).
+            api_kwargs (:obj:`dict`, optional): Arbitrary keyword arguments to be passed to the
+                Telegram API.
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        Raises:
+            :class:`telegram.error.TelegramError`
+        """
+        data: JSONDict = {'chat_id': chat_id, 'user_id': user_id}
+
+        result = self._post('declineChatJoinRequest', data, timeout=timeout, api_kwargs=api_kwargs)
+
+        return result  # type: ignore[return-value]
+
    @log
    def set_chat_photo(
        self,
@@ -5296,7 +5418,7 @@ class Bot(TelegramObject):
            'disable_notification': disable_notification,
            'allow_sending_without_reply': allow_sending_without_reply,
        }
-        if caption:
+        if caption is not None:
            data['caption'] = caption
        if caption_entities:
            data['caption_entities'] = caption_entities
@@ -5436,11 +5558,15 @@ class Bot(TelegramObject):
    exportChatInviteLink = export_chat_invite_link
    """Alias for :meth:`export_chat_invite_link`"""
    createChatInviteLink = create_chat_invite_link
-    """Alias for :attr:`create_chat_invite_link`"""
+    """Alias for :meth:`create_chat_invite_link`"""
    editChatInviteLink = edit_chat_invite_link
-    """Alias for :attr:`edit_chat_invite_link`"""
+    """Alias for :meth:`edit_chat_invite_link`"""
    revokeChatInviteLink = revoke_chat_invite_link
-    """Alias for :attr:`revoke_chat_invite_link`"""
+    """Alias for :meth:`revoke_chat_invite_link`"""
+    approveChatJoinRequest = approve_chat_join_request
+    """Alias for :meth:`approve_chat_join_request`"""
+    declineChatJoinRequest = decline_chat_join_request
+    """Alias for :meth:`decline_chat_join_request`"""
    setChatPhoto = set_chat_photo
    """Alias for :meth:`set_chat_photo`"""
    deleteChatPhoto = delete_chat_photo
@@ -1524,6 +1524,8 @@ class Chat(TelegramObject):
        member_limit: int = None,
        timeout: ODVInput[float] = DEFAULT_NONE,
        api_kwargs: JSONDict = None,
+        name: str = None,
+        creates_join_request: bool = None,
    ) -> 'ChatInviteLink':
        """Shortcut for::

@@ -1534,6 +1536,10 @@ class Chat(TelegramObject):

        .. versionadded:: 13.4

+        .. versionchanged:: 13.8
+           Edited signature according to the changes of
+           :meth:`telegram.Bot.create_chat_invite_link`.
+
        Returns:
            :class:`telegram.ChatInviteLink`

@@ -1544,6 +1550,8 @@ class Chat(TelegramObject):
            member_limit=member_limit,
            timeout=timeout,
            api_kwargs=api_kwargs,
+            name=name,
+            creates_join_request=creates_join_request,
        )

    def edit_invite_link(
@@ -1553,6 +1561,8 @@ class Chat(TelegramObject):
        member_limit: int = None,
        timeout: ODVInput[float] = DEFAULT_NONE,
        api_kwargs: JSONDict = None,
+        name: str = None,
+        creates_join_request: bool = None,
    ) -> 'ChatInviteLink':
        """Shortcut for::

@@ -1563,6 +1573,9 @@ class Chat(TelegramObject):

        .. versionadded:: 13.4

+        .. versionchanged:: 13.8
+           Edited signature according to the changes of :meth:`telegram.Bot.edit_chat_invite_link`.
+
        Returns:
            :class:`telegram.ChatInviteLink`

@@ -1574,6 +1587,8 @@ class Chat(TelegramObject):
            member_limit=member_limit,
            timeout=timeout,
            api_kwargs=api_kwargs,
+            name=name,
+            creates_join_request=creates_join_request,
        )

    def revoke_invite_link(
@@ -1598,3 +1613,49 @@ class Chat(TelegramObject):
        return self.bot.revoke_chat_invite_link(
            chat_id=self.id, invite_link=invite_link, timeout=timeout, api_kwargs=api_kwargs
        )
+
+    def approve_join_request(
+        self,
+        user_id: int,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.approve_chat_join_request(chat_id=update.effective_chat.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.approve_chat_join_request`.
+
+        .. versionadded:: 13.8
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.approve_chat_join_request(
+            chat_id=self.id, user_id=user_id, timeout=timeout, api_kwargs=api_kwargs
+        )
+
+    def decline_join_request(
+        self,
+        user_id: int,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.decline_chat_join_request(chat_id=update.effective_chat.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.decline_chat_join_request`.
+
+        .. versionadded:: 13.8
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.decline_chat_join_request(
+            chat_id=self.id, user_id=user_id, timeout=timeout, api_kwargs=api_kwargs
+        )
@@ -59,6 +59,10 @@ class ChatAction:
    """
    UPLOAD_DOCUMENT: ClassVar[str] = constants.CHATACTION_UPLOAD_DOCUMENT
    """:const:`telegram.constants.CHATACTION_UPLOAD_DOCUMENT`"""
+    CHOOSE_STICKER: ClassVar[str] = constants.CHATACTION_CHOOSE_STICKER
+    """:const:`telegram.constants.CHOOSE_STICKER`
+
+        .. versionadded:: 13.8"""
    UPLOAD_PHOTO: ClassVar[str] = constants.CHATACTION_UPLOAD_PHOTO
    """:const:`telegram.constants.CHATACTION_UPLOAD_PHOTO`"""
    UPLOAD_VIDEO: ClassVar[str] = constants.CHATACTION_UPLOAD_VIDEO
@@ -46,6 +46,17 @@ class ChatInviteLink(TelegramObject):
            has been expired.
        member_limit (:obj:`int`, optional): Maximum number of users that can be members of the
            chat simultaneously after joining the chat via this invite link; 1-99999.
+        name (:obj:`str`, optional): Invite link name.
+
+            .. versionadded:: 13.8
+        creates_join_request (:obj:`bool`, optional): :obj:`True`, if users joining the chat via
+            the link need to be approved by chat administrators.
+
+            .. versionadded:: 13.8
+        pending_join_request_count (:obj:`int`, optional): Number of pending join requests
+            created using this link.
+
+            .. versionadded:: 13.8

    Attributes:
        invite_link (:obj:`str`): The invite link. If the link was created by another chat
@@ -57,6 +68,17 @@ class ChatInviteLink(TelegramObject):
            has been expired.
        member_limit (:obj:`int`): Optional. Maximum number of users that can be members
            of the chat simultaneously after joining the chat via this invite link; 1-99999.
+        name (:obj:`str`): Optional. Invite link name.
+
+            .. versionadded:: 13.8
+        creates_join_request (:obj:`bool`): Optional. :obj:`True`, if users joining the chat via
+            the link need to be approved by chat administrators.
+
+            .. versionadded:: 13.8
+        pending_join_request_count (:obj:`int`): Optional. Number of pending join requests
+            created using this link.
+
+            .. versionadded:: 13.8

    """

@@ -67,6 +89,9 @@ class ChatInviteLink(TelegramObject):
        'is_revoked',
        'expire_date',
        'member_limit',
+        'name',
+        'creates_join_request',
+        'pending_join_request_count',
        '_id_attrs',
    )

@@ -78,6 +103,9 @@ class ChatInviteLink(TelegramObject):
        is_revoked: bool,
        expire_date: datetime.datetime = None,
        member_limit: int = None,
+        name: str = None,
+        creates_join_request: bool = None,
+        pending_join_request_count: int = None,
        **_kwargs: Any,
    ):
        # Required
@@ -89,7 +117,11 @@ class ChatInviteLink(TelegramObject):
        # Optionals
        self.expire_date = expire_date
        self.member_limit = int(member_limit) if member_limit is not None else None
-
+        self.name = name
+        self.creates_join_request = creates_join_request
+        self.pending_join_request_count = (
+            int(pending_join_request_count) if pending_join_request_count is not None else None
+        )
        self._id_attrs = (self.invite_link, self.creator, self.is_primary, self.is_revoked)

    @classmethod
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+"""This module contains an object that represents a Telegram ChatJoinRequest."""
+import datetime
+from typing import TYPE_CHECKING, Any, Optional
+
+from telegram import TelegramObject, User, Chat, ChatInviteLink
+from telegram.utils.helpers import from_timestamp, to_timestamp, DEFAULT_NONE
+from telegram.utils.types import JSONDict, ODVInput
+
+if TYPE_CHECKING:
+    from telegram import Bot
+
+
+class ChatJoinRequest(TelegramObject):
+    """This object represents a join request sent to a chat.
+
+    Objects of this class are comparable in terms of equality. Two objects of this class are
+    considered equal, if their :attr:`chat`, :attr:`from_user` and :attr:`date` are equal.
+
+    .. versionadded:: 13.8
+
+    Args:
+        chat (:class:`telegram.Chat`): Chat to which the request was sent.
+        from_user (:class:`telegram.User`): User that sent the join request.
+        date (:class:`datetime.datetime`): Date the request was sent.
+        bio (:obj:`str`, optional): Bio of the user.
+        invite_link (:class:`telegram.ChatInviteLink`, optional): Chat invite link that was used
+            by the user to send the join request.
+        bot (:class:`telegram.Bot`, optional): The Bot to use for instance methods.
+
+    Attributes:
+        chat (:class:`telegram.Chat`): Chat to which the request was sent.
+        from_user (:class:`telegram.User`): User that sent the join request.
+        date (:class:`datetime.datetime`): Date the request was sent.
+        bio (:obj:`str`): Optional. Bio of the user.
+        invite_link (:class:`telegram.ChatInviteLink`): Optional. Chat invite link that was used
+            by the user to send the join request.
+
+    """
+
+    __slots__ = (
+        'chat',
+        'from_user',
+        'date',
+        'bio',
+        'invite_link',
+        'bot',
+        '_id_attrs',
+    )
+
+    def __init__(
+        self,
+        chat: Chat,
+        from_user: User,
+        date: datetime.datetime,
+        bio: str = None,
+        invite_link: ChatInviteLink = None,
+        bot: 'Bot' = None,
+        **_kwargs: Any,
+    ):
+        # Required
+        self.chat = chat
+        self.from_user = from_user
+        self.date = date
+
+        # Optionals
+        self.bio = bio
+        self.invite_link = invite_link
+
+        self.bot = bot
+        self._id_attrs = (self.chat, self.from_user, self.date)
+
+    @classmethod
+    def de_json(cls, data: Optional[JSONDict], bot: 'Bot') -> Optional['ChatJoinRequest']:
+        """See :meth:`telegram.TelegramObject.de_json`."""
+        data = cls._parse_data(data)
+
+        if not data:
+            return None
+
+        data['chat'] = Chat.de_json(data.get('chat'), bot)
+        data['from_user'] = User.de_json(data.get('from'), bot)
+        data['date'] = from_timestamp(data.get('date', None))
+        data['invite_link'] = ChatInviteLink.de_json(data.get('invite_link'), bot)
+
+        return cls(bot=bot, **data)
+
+    def to_dict(self) -> JSONDict:
+        """See :meth:`telegram.TelegramObject.to_dict`."""
+        data = super().to_dict()
+
+        data['date'] = to_timestamp(self.date)
+
+        return data
+
+    def approve(
+        self,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.approve_chat_join_request(chat_id=update.effective_chat.id,
+            user_id=update.effective_user.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.approve_chat_join_request`.
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.approve_chat_join_request(
+            chat_id=self.chat.id, user_id=self.from_user.id, timeout=timeout, api_kwargs=api_kwargs
+        )
+
+    def decline(
+        self,
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.decline_chat_join_request(chat_id=update.effective_chat.id,
+            user_id=update.effective_user.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.decline_chat_join_request`.
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.decline_chat_join_request(
+            chat_id=self.chat.id, user_id=self.from_user.id, timeout=timeout, api_kwargs=api_kwargs
+        )
@@ -86,6 +86,9 @@ Attributes:

        .. versionadded:: 13.5
    CHATACTION_UPLOAD_DOCUMENT (:obj:`str`): ``'upload_document'``
+    CHATACTION_CHOOSE_STICKER (:obj:`str`): ``'choose_sticker'``
+
+        .. versionadded:: 13.8
    CHATACTION_UPLOAD_PHOTO (:obj:`str`): ``'upload_photo'``
    CHATACTION_UPLOAD_VIDEO (:obj:`str`): ``'upload_video'``
    CHATACTION_UPLOAD_VIDEO_NOTE (:obj:`str`): ``'upload_video_note'``
@@ -201,9 +204,13 @@ Attributes:
    UPDATE_CHAT_MEMBER (:obj:`str`): ``'chat_member'``

        .. versionadded:: 13.5
+    UPDATE_CHAT_JOIN_REQUEST (:obj:`str`): ``'chat_join_request'``
+
+        .. versionadded:: 13.8
    UPDATE_ALL_TYPES (List[:obj:`str`]): List of all update types.

        .. versionadded:: 13.5
+        .. versionchanged:: 13.8

 :class:`telegram.BotCommandScope`:

@@ -233,7 +240,7 @@ Attributes:
 """
 from typing import List

-BOT_API_VERSION: str = '5.3'
+BOT_API_VERSION: str = '5.4'
 MAX_MESSAGE_LENGTH: int = 4096
 MAX_CAPTION_LENGTH: int = 1024
 ANONYMOUS_ADMIN_ID: int = 1087968824
@@ -267,6 +274,7 @@ CHATACTION_TYPING: str = 'typing'
 CHATACTION_UPLOAD_AUDIO: str = 'upload_audio'
 CHATACTION_UPLOAD_VOICE: str = 'upload_voice'
 CHATACTION_UPLOAD_DOCUMENT: str = 'upload_document'
+CHATACTION_CHOOSE_STICKER: str = 'choose_sticker'
 CHATACTION_UPLOAD_PHOTO: str = 'upload_photo'
 CHATACTION_UPLOAD_VIDEO: str = 'upload_video'
 CHATACTION_UPLOAD_VIDEO_NOTE: str = 'upload_video_note'
@@ -353,6 +361,7 @@ UPDATE_POLL = 'poll'
 UPDATE_POLL_ANSWER = 'poll_answer'
 UPDATE_MY_CHAT_MEMBER = 'my_chat_member'
 UPDATE_CHAT_MEMBER = 'chat_member'
+UPDATE_CHAT_JOIN_REQUEST = 'chat_join_request'
 UPDATE_ALL_TYPES = [
    UPDATE_MESSAGE,
    UPDATE_EDITED_MESSAGE,
@@ -367,6 +376,7 @@ UPDATE_ALL_TYPES = [
    UPDATE_POLL_ANSWER,
    UPDATE_MY_CHAT_MEMBER,
    UPDATE_CHAT_MEMBER,
+    UPDATE_CHAT_JOIN_REQUEST,
 ]

 BOT_COMMAND_SCOPE_DEFAULT = 'default'
@@ -59,6 +59,7 @@ from .messagequeue import DelayQueue
 from .pollanswerhandler import PollAnswerHandler
 from .pollhandler import PollHandler
 from .chatmemberhandler import ChatMemberHandler
+from .chatjoinrequesthandler import ChatJoinRequestHandler
 from .defaults import Defaults
 from .callbackdatacache import CallbackDataCache, InvalidCallbackData

@@ -68,6 +69,7 @@ __all__ = (
    'CallbackContext',
    'CallbackDataCache',
    'CallbackQueryHandler',
+    'ChatJoinRequestHandler',
    'ChatMemberHandler',
    'ChosenInlineResultHandler',
    'CommandHandler',
@@ -277,8 +277,6 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                new_obj[cls._replace_bot(k, memo)] = cls._replace_bot(val, memo)
            memo[obj_id] = new_obj
            return new_obj
-        # if '__dict__' in obj.__slots__, we already cover this here, that's why the
-        # __dict__ case comes below
        try:
            if hasattr(obj, '__slots__'):
                for attr_name in new_obj.__slots__:
@@ -289,8 +287,11 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                            cls._replace_bot(getattr(new_obj, attr_name), memo), memo
                        ),
                    )
-                memo[obj_id] = new_obj
-                return new_obj
+                if '__dict__' in obj.__slots__:
+                    # In this case, we have already covered the case that obj has __dict__
+                    # Note that obj may have a __dict__ even if it's not in __slots__!
+                    memo[obj_id] = new_obj
+                    return new_obj
            if hasattr(obj, '__dict__'):
                for attr_name, attr in new_obj.__dict__.items():
                    setattr(new_obj, attr_name, cls._replace_bot(attr, memo))
@@ -302,9 +303,8 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                f'See the docs of BasePersistence.replace_bot for more information.',
                RuntimeWarning,
            )
-            memo[obj_id] = obj
-            return obj

+        memo[obj_id] = obj
        return obj

    def insert_bot(self, obj: object) -> object:
@@ -379,8 +379,6 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                new_obj[self._insert_bot(k, memo)] = self._insert_bot(val, memo)
            memo[obj_id] = new_obj
            return new_obj
-        # if '__dict__' in obj.__slots__, we already cover this here, that's why the
-        # __dict__ case comes below
        try:
            if hasattr(obj, '__slots__'):
                for attr_name in obj.__slots__:
@@ -391,8 +389,11 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                            self._insert_bot(getattr(new_obj, attr_name), memo), memo
                        ),
                    )
-                memo[obj_id] = new_obj
-                return new_obj
+                if '__dict__' in obj.__slots__:
+                    # In this case, we have already covered the case that obj has __dict__
+                    # Note that obj may have a __dict__ even if it's not in __slots__!
+                    memo[obj_id] = new_obj
+                    return new_obj
            if hasattr(obj, '__dict__'):
                for attr_name, attr in new_obj.__dict__.items():
                    setattr(new_obj, attr_name, self._insert_bot(attr, memo))
@@ -404,9 +405,8 @@ class BasePersistence(Generic[UD, CD, BD], ABC):
                f'See the docs of BasePersistence.insert_bot for more information.',
                RuntimeWarning,
            )
-            memo[obj_id] = obj
-            return obj

+        memo[obj_id] = obj
        return obj

    @abstractmethod
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+"""This module contains the ChatJoinRequestHandler class."""
+
+
+from telegram import Update
+
+from .handler import Handler
+from .utils.types import CCT
+
+
+class ChatJoinRequestHandler(Handler[Update, CCT]):
+    """Handler class to handle Telegram updates that contain a chat join request.
+
+    Note:
+        :attr:`pass_user_data` and :attr:`pass_chat_data` determine whether a ``dict`` you
+        can use to keep any data in will be sent to the :attr:`callback` function. Related to
+        either the user or the chat that the update was sent in. For each update from the same user
+        or in the same chat, it will be the same ``dict``.
+
+        Note that this is DEPRECATED, and you should use context based callbacks. See
+        https://git.io/fxJuV for more info.
+
+    Warning:
+        When setting ``run_async`` to :obj:`True`, you cannot rely on adding custom
+        attributes to :class:`telegram.ext.CallbackContext`. See its docs for more info.
+
+        .. versionadded:: 13.8
+
+    Args:
+        callback (:obj:`callable`): The callback function for this handler. Will be called when
+            :attr:`check_update` has determined that an update should be processed by this handler.
+            Callback signature for context based API:
+
+            ``def callback(update: Update, context: CallbackContext)``
+
+            The return value of the callback is usually ignored except for the special case of
+            :class:`telegram.ext.ConversationHandler`.
+        pass_update_queue (:obj:`bool`, optional): If set to :obj:`True`, a keyword argument called
+            ``update_queue`` will be passed to the callback function. It will be the ``Queue``
+            instance used by the :class:`telegram.ext.Updater` and :class:`telegram.ext.Dispatcher`
+            that contains new updates which can be used to insert updates. Default is :obj:`False`.
+            DEPRECATED: Please switch to context based callbacks.
+        pass_job_queue (:obj:`bool`, optional): If set to :obj:`True`, a keyword argument called
+            ``job_queue`` will be passed to the callback function. It will be a
+            :class:`telegram.ext.JobQueue` instance created by the :class:`telegram.ext.Updater`
+            which can be used to schedule new jobs. Default is :obj:`False`.
+            DEPRECATED: Please switch to context based callbacks.
+        pass_user_data (:obj:`bool`, optional): If set to :obj:`True`, a keyword argument called
+            ``user_data`` will be passed to the callback function. Default is :obj:`False`.
+            DEPRECATED: Please switch to context based callbacks.
+        pass_chat_data (:obj:`bool`, optional): If set to :obj:`True`, a keyword argument called
+            ``chat_data`` will be passed to the callback function. Default is :obj:`False`.
+            DEPRECATED: Please switch to context based callbacks.
+        run_async (:obj:`bool`): Determines whether the callback will run asynchronously.
+            Defaults to :obj:`False`.
+
+    Attributes:
+        callback (:obj:`callable`): The callback function for this handler.
+        pass_update_queue (:obj:`bool`): Determines whether ``update_queue`` will be
+            passed to the callback function.
+        pass_job_queue (:obj:`bool`): Determines whether ``job_queue`` will be passed to
+            the callback function.
+        pass_user_data (:obj:`bool`): Determines whether ``user_data`` will be passed to
+            the callback function.
+        pass_chat_data (:obj:`bool`): Determines whether ``chat_data`` will be passed to
+            the callback function.
+        run_async (:obj:`bool`): Determines whether the callback will run asynchronously.
+
+    """
+
+    __slots__ = ()
+
+    def check_update(self, update: object) -> bool:
+        """Determines whether an update should be passed to this handlers :attr:`callback`.
+
+        Args:
+            update (:class:`telegram.Update` | :obj:`object`): Incoming update.
+
+        Returns:
+            :obj:`bool`
+
+        """
+        return isinstance(update, Update) and bool(update.chat_join_request)
@@ -325,3 +325,13 @@ class ExtBot(telegram.bot.Bot):
        # We override this method to call self._insert_callback_data
        result = super().get_chat(chat_id=chat_id, timeout=timeout, api_kwargs=api_kwargs)
        return self._insert_callback_data(result)
+
+    # updated camelCase aliases
+    getChat = get_chat
+    """Alias for :meth:`get_chat`"""
+    copyMessage = copy_message
+    """Alias for :meth:`copy_message`"""
+    getUpdates = get_updates
+    """Alias for :meth:`get_updates`"""
+    stopPoll = stop_poll
+    """Alias for :meth:`stop_poll`"""
@@ -31,6 +31,7 @@ from telegram import (
    TelegramObject,
    ChatMemberUpdated,
    constants,
+    ChatJoinRequest,
 )
 from telegram.poll import PollAnswer
 from telegram.utils.types import JSONDict
@@ -89,6 +90,12 @@ class Update(TelegramObject):
            :meth:`telegram.ext.Updater.start_webhook`).

            .. versionadded:: 13.4
+        chat_join_request (:class:`telegram.ChatJoinRequest`, optional): A request to join the
+            chat has been sent. The bot must have the
+            :attr:`telegram.ChatPermissions.can_invite_users` administrator right in the chat to
+            receive these updates.
+
+            .. versionadded:: 13.8
        **kwargs (:obj:`dict`): Arbitrary keyword arguments.

    Attributes:
@@ -122,6 +129,11 @@ class Update(TelegramObject):
            :meth:`telegram.ext.Updater.start_webhook`).

            .. versionadded:: 13.4
+        chat_join_request (:class:`telegram.ChatJoinRequest`): Optional. A request to join the
+            chat has been sent. The bot must have the ``'can_invite_users'`` administrator
+            right in the chat to receive these updates.
+
+            .. versionadded:: 13.8

    """

@@ -143,6 +155,7 @@ class Update(TelegramObject):
        '_effective_message',
        'my_chat_member',
        'chat_member',
+        'chat_join_request',
        '_id_attrs',
    )

@@ -198,6 +211,10 @@ class Update(TelegramObject):
    """:const:`telegram.constants.UPDATE_CHAT_MEMBER`

    .. versionadded:: 13.5"""
+    CHAT_JOIN_REQUEST = constants.UPDATE_CHAT_JOIN_REQUEST
+    """:const:`telegram.constants.UPDATE_CHAT_JOIN_REQUEST`
+
+    .. versionadded:: 13.8"""
    ALL_TYPES = constants.UPDATE_ALL_TYPES
    """:const:`telegram.constants.UPDATE_ALL_TYPES`

@@ -219,6 +236,7 @@ class Update(TelegramObject):
        poll_answer: PollAnswer = None,
        my_chat_member: ChatMemberUpdated = None,
        chat_member: ChatMemberUpdated = None,
+        chat_join_request: ChatJoinRequest = None,
        **_kwargs: Any,
    ):
        # Required
@@ -237,6 +255,7 @@ class Update(TelegramObject):
        self.poll_answer = poll_answer
        self.my_chat_member = my_chat_member
        self.chat_member = chat_member
+        self.chat_join_request = chat_join_request

        self._effective_user: Optional['User'] = None
        self._effective_chat: Optional['Chat'] = None
@@ -286,6 +305,9 @@ class Update(TelegramObject):
        elif self.chat_member:
            user = self.chat_member.from_user

+        elif self.chat_join_request:
+            user = self.chat_join_request.from_user
+
        self._effective_user = user
        return user

@@ -325,6 +347,9 @@ class Update(TelegramObject):
        elif self.chat_member:
            chat = self.chat_member.chat

+        elif self.chat_join_request:
+            chat = self.chat_join_request.chat
+
        self._effective_chat = chat
        return chat

@@ -335,7 +360,9 @@ class Update(TelegramObject):
            update this is. Will be :obj:`None` for :attr:`inline_query`,
            :attr:`chosen_inline_result`, :attr:`callback_query` from inline messages,
            :attr:`shipping_query`, :attr:`pre_checkout_query`, :attr:`poll`,
-            :attr:`poll_answer`, :attr:`my_chat_member` and :attr:`chat_member`.
+            :attr:`poll_answer`, :attr:`my_chat_member`, :attr:`chat_member` as well as
+            :attr:`chat_join_request` in case the bot is missing the
+            :attr:`telegram.ChatPermissions.can_invite_users` administrator right in the chat.

        """
        if self._effective_message:
@@ -384,5 +411,6 @@ class Update(TelegramObject):
        data['poll_answer'] = PollAnswer.de_json(data.get('poll_answer'), bot)
        data['my_chat_member'] = ChatMemberUpdated.de_json(data.get('my_chat_member'), bot)
        data['chat_member'] = ChatMemberUpdated.de_json(data.get('chat_member'), bot)
+        data['chat_join_request'] = ChatJoinRequest.de_json(data.get('chat_join_request'), bot)

        return cls(**data)
@@ -1140,3 +1140,49 @@ class User(TelegramObject):
            timeout=timeout,
            api_kwargs=api_kwargs,
        )
+
+    def approve_join_request(
+        self,
+        chat_id: Union[int, str],
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.approve_chat_join_request(user_id=update.effective_user.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.approve_chat_join_request`.
+
+        .. versionadded:: 13.8
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.approve_chat_join_request(
+            user_id=self.id, chat_id=chat_id, timeout=timeout, api_kwargs=api_kwargs
+        )
+
+    def decline_join_request(
+        self,
+        chat_id: Union[int, str],
+        timeout: ODVInput[float] = DEFAULT_NONE,
+        api_kwargs: JSONDict = None,
+    ) -> bool:
+        """Shortcut for::
+
+            bot.decline_chat_join_request(user_id=update.effective_user.id, *args, **kwargs)
+
+        For the documentation of the arguments, please see
+        :meth:`telegram.Bot.decline_chat_join_request`.
+
+        .. versionadded:: 13.8
+
+        Returns:
+            :obj:`bool`: On success, :obj:`True` is returned.
+
+        """
+        return self.bot.decline_chat_join_request(
+            user_id=self.id, chat_id=chat_id, timeout=timeout, api_kwargs=api_kwargs
+        )
@@ -58,7 +58,7 @@ except ImportError:  # pragma: no cover
        raise

 # pylint: disable=C0412
-from telegram import InputFile, InputMedia, TelegramError
+from telegram import InputFile, TelegramError
 from telegram.error import (
    BadRequest,
    ChatMigrated,
@@ -325,13 +325,9 @@ class Request:
                # Urllib3 doesn't like floats it seems
                data[key] = str(val)
            elif key == 'media':
-                # One media or multiple
-                if isinstance(val, InputMedia):
-                    # Attach and set val to attached name
-                    data[key] = val.to_json()
-                    if isinstance(val.media, InputFile):  # type: ignore
-                        data[val.media.attach] = val.media.field_tuple  # type: ignore
-                else:
+                files = True
+                # List of media
+                if isinstance(val, list):
                    # Attach and set val to attached name for all
                    media = []
                    for med in val:
@@ -343,7 +339,16 @@ class Request:
                            if "thumb" in media_dict:
                                data[med.thumb.attach] = med.thumb.field_tuple
                    data[key] = json.dumps(media)
-                files = True
+                # Single media
+                else:
+                    # Attach and set val to attached name
+                    media_dict = val.to_dict()
+                    if isinstance(val.media, InputFile):
+                        data[val.media.attach] = val.media.field_tuple
+                        # if the file has a thumb, we also need to attach it to the data
+                        if "thumb" in media_dict:
+                            data[val.thumb.attach] = val.thumb.field_tuple
+                    data[key] = json.dumps(media_dict)
            elif isinstance(val, list):
                # In case we're sending files, we need to json-dump lists manually
                # As we can't know if that's the case, we just json-dump here
@@ -20,5 +20,5 @@

 from telegram import constants

-__version__ = '13.7'
+__version__ = '13.8'
 bot_api_version = constants.BOT_API_VERSION  # pylint: disable=C0103
@@ -66,6 +66,14 @@ from tests.conftest import expect_bad_request, check_defaults_handling, GITHUB_A
 from tests.bots import FALLBACKS


+def to_camel_case(snake_str):
+    """https://stackoverflow.com/a/19053800"""
+    components = snake_str.split('_')
+    # We capitalize the first letter of each component except the first one
+    # with the 'title' method and join them together.
+    return components[0] + ''.join(x.title() for x in components[1:])
+
+
 class ExtBotSubClass(ExtBot):
    # used for test_defaults_warning below
    pass
@@ -710,6 +718,7 @@ class TestBot:
            ChatAction.UPLOAD_VIDEO,
            ChatAction.UPLOAD_VIDEO_NOTE,
            ChatAction.UPLOAD_VOICE,
+            ChatAction.CHOOSE_STICKER,
        ],
    )
    def test_send_chat_action(self, bot, chat_id, chat_action):
@@ -1688,6 +1697,37 @@ class TestBot:
        assert isinstance(invite_link, str)
        assert invite_link != ''

+    def test_create_edit_invite_link_mutually_exclusive_arguments(self, bot, channel_id):
+        data = {'chat_id': channel_id, 'member_limit': 17, 'creates_join_request': True}
+
+        with pytest.raises(ValueError, match="`member_limit` can't be specified"):
+            bot.create_chat_invite_link(**data)
+
+        data.update({'invite_link': 'https://invite.link'})
+        with pytest.raises(ValueError, match="`member_limit` can't be specified"):
+            bot.edit_chat_invite_link(**data)
+
+    @flaky(3, 1)
+    @pytest.mark.parametrize('creates_join_request', [True, False])
+    @pytest.mark.parametrize('name', [None, 'name'])
+    def test_create_chat_invite_link_basics(self, bot, creates_join_request, name, channel_id):
+        data = {}
+        if creates_join_request:
+            data['creates_join_request'] = True
+        if name:
+            data['name'] = name
+        invite_link = bot.create_chat_invite_link(chat_id=channel_id, **data)
+
+        assert invite_link.member_limit is None
+        assert invite_link.expire_date is None
+        assert invite_link.creates_join_request == creates_join_request
+        assert invite_link.name == name
+
+        revoked_link = bot.revoke_chat_invite_link(
+            chat_id=channel_id, invite_link=invite_link.invite_link
+        )
+        assert revoked_link.is_revoked
+
    @flaky(3, 1)
    @pytest.mark.parametrize('datetime', argvalues=[True, False], ids=['datetime', 'integer'])
    def test_advanced_chat_invite_links(self, bot, channel_id, datetime):
@@ -1712,12 +1752,29 @@ class TestBot:
        aware_time_in_future = pytz.UTC.localize(time_in_future)

        edited_invite_link = bot.edit_chat_invite_link(
-            channel_id, invite_link.invite_link, expire_date=expire_time, member_limit=20
+            channel_id,
+            invite_link.invite_link,
+            expire_date=expire_time,
+            member_limit=20,
+            name='NewName',
        )
        assert edited_invite_link.invite_link == invite_link.invite_link
        assert pytest.approx(edited_invite_link.expire_date == aware_time_in_future)
+        assert edited_invite_link.name == 'NewName'
        assert edited_invite_link.member_limit == 20

+        edited_invite_link = bot.edit_chat_invite_link(
+            channel_id,
+            invite_link.invite_link,
+            name='EvenNewerName',
+            creates_join_request=True,
+        )
+        assert edited_invite_link.invite_link == invite_link.invite_link
+        assert pytest.approx(edited_invite_link.expire_date == aware_time_in_future)
+        assert edited_invite_link.name == 'EvenNewerName'
+        assert edited_invite_link.creates_join_request is True
+        assert edited_invite_link.member_limit is None
+
        revoked_invite_link = bot.revoke_chat_invite_link(channel_id, invite_link.invite_link)
        assert revoked_invite_link.invite_link == invite_link.invite_link
        assert revoked_invite_link.is_revoked is True
@@ -1742,16 +1799,49 @@ class TestBot:
        time_in_future = aware_expire_date.replace(tzinfo=None)

        edited_invite_link = tz_bot.edit_chat_invite_link(
-            channel_id, invite_link.invite_link, expire_date=time_in_future, member_limit=20
+            channel_id,
+            invite_link.invite_link,
+            expire_date=time_in_future,
+            member_limit=20,
+            name='NewName',
        )
        assert edited_invite_link.invite_link == invite_link.invite_link
        assert pytest.approx(edited_invite_link.expire_date == aware_expire_date)
+        assert edited_invite_link.name == 'NewName'
        assert edited_invite_link.member_limit == 20

+        edited_invite_link = tz_bot.edit_chat_invite_link(
+            channel_id,
+            invite_link.invite_link,
+            name='EvenNewerName',
+            creates_join_request=True,
+        )
+        assert edited_invite_link.invite_link == invite_link.invite_link
+        assert pytest.approx(edited_invite_link.expire_date == aware_expire_date)
+        assert edited_invite_link.name == 'EvenNewerName'
+        assert edited_invite_link.creates_join_request is True
+        assert edited_invite_link.member_limit is None
+
        revoked_invite_link = tz_bot.revoke_chat_invite_link(channel_id, invite_link.invite_link)
        assert revoked_invite_link.invite_link == invite_link.invite_link
        assert revoked_invite_link.is_revoked is True

+    @flaky(3, 1)
+    def test_approve_chat_join_request(self, bot, chat_id, channel_id):
+        # TODO: Need incoming join request to properly test
+        # Since we can't create join requests on the fly, we just tests the call to TG
+        # by checking that it complains about approving a user who is already in the chat
+        with pytest.raises(BadRequest, match='User_already_participant'):
+            bot.approve_chat_join_request(chat_id=channel_id, user_id=chat_id)
+
+    @flaky(3, 1)
+    def test_decline_chat_join_request(self, bot, chat_id, channel_id):
+        # TODO: Need incoming join request to properly test
+        # Since we can't create join requests on the fly, we just tests the call to TG
+        # by checking that it complains about declining a user who is already in the chat
+        with pytest.raises(BadRequest, match='User_already_participant'):
+            bot.decline_chat_join_request(chat_id=channel_id, user_id=chat_id)
+
    @flaky(3, 1)
    def test_set_chat_photo(self, bot, channel_id):
        def func():
@@ -2024,7 +2114,8 @@ class TestBot:

    @flaky(3, 1)
    @pytest.mark.parametrize('json_keyboard', [True, False])
-    def test_copy_message(self, monkeypatch, bot, chat_id, media_message, json_keyboard):
+    @pytest.mark.parametrize('caption', ["<b>Test</b>", '', None])
+    def test_copy_message(self, monkeypatch, bot, chat_id, media_message, json_keyboard, caption):
        keyboard = InlineKeyboardMarkup(
            [[InlineKeyboardButton(text="test", callback_data="test2")]]
        )
@@ -2033,7 +2124,7 @@ class TestBot:
            assert data["chat_id"] == chat_id
            assert data["from_chat_id"] == chat_id
            assert data["message_id"] == media_message.message_id
-            assert data["caption"] == "<b>Test</b>"
+            assert data.get("caption") == caption
            assert data["parse_mode"] == ParseMode.HTML
            assert data["reply_to_message_id"] == media_message.message_id
            assert data["reply_markup"] == keyboard.to_json()
@@ -2046,7 +2137,7 @@ class TestBot:
            chat_id,
            from_chat_id=chat_id,
            message_id=media_message.message_id,
-            caption="<b>Test</b>",
+            caption=caption,
            caption_entities=[MessageEntity(MessageEntity.BOLD, 0, 4)],
            parse_mode=ParseMode.HTML,
            reply_to_message_id=media_message.message_id,
@@ -2454,3 +2545,25 @@ class TestBot:
            assert 'Passing Defaults to telegram.Bot is deprecated.' in str(recwarn[-1].message)
        else:
            assert len(recwarn) == 0
+
+    def test_camel_case_redefinition_extbot(self):
+        invalid_camel_case_functions = []
+        for function_name, function in ExtBot.__dict__.items():
+            camel_case_function = getattr(ExtBot, to_camel_case(function_name), False)
+            if callable(function) and camel_case_function and camel_case_function is not function:
+                invalid_camel_case_functions.append(function_name)
+        assert invalid_camel_case_functions == []
+
+    def test_camel_case_bot(self):
+        not_available_camelcase_functions = []
+        for function_name, function in Bot.__dict__.items():
+            if (
+                function_name.startswith("_")
+                or not callable(function)
+                or function_name == "to_dict"
+            ):
+                continue
+            camel_case_function = getattr(Bot, to_camel_case(function_name), False)
+            if not camel_case_function:
+                not_available_camelcase_functions.append(function_name)
+        assert not_available_camelcase_functions == []
@@ -636,6 +636,36 @@ class TestChat:
        monkeypatch.setattr(chat.bot, 'revoke_chat_invite_link', make_assertion)
        assert chat.revoke_invite_link(invite_link=link)

+    def test_approve_join_request(self, monkeypatch, chat):
+        def make_assertion(*_, **kwargs):
+            return kwargs['chat_id'] == chat.id and kwargs['user_id'] == 42
+
+        assert check_shortcut_signature(
+            Chat.approve_join_request, Bot.approve_chat_join_request, ['chat_id'], []
+        )
+        assert check_shortcut_call(
+            chat.approve_join_request, chat.bot, 'approve_chat_join_request'
+        )
+        assert check_defaults_handling(chat.approve_join_request, chat.bot)
+
+        monkeypatch.setattr(chat.bot, 'approve_chat_join_request', make_assertion)
+        assert chat.approve_join_request(user_id=42)
+
+    def test_decline_join_request(self, monkeypatch, chat):
+        def make_assertion(*_, **kwargs):
+            return kwargs['chat_id'] == chat.id and kwargs['user_id'] == 42
+
+        assert check_shortcut_signature(
+            Chat.decline_join_request, Bot.decline_chat_join_request, ['chat_id'], []
+        )
+        assert check_shortcut_call(
+            chat.decline_join_request, chat.bot, 'decline_chat_join_request'
+        )
+        assert check_defaults_handling(chat.decline_join_request, chat.bot)
+
+        monkeypatch.setattr(chat.bot, 'decline_chat_join_request', make_assertion)
+        assert chat.decline_join_request(user_id=42)
+
    def test_equality(self):
        a = Chat(self.id_, self.title, self.type_)
        b = Chat(self.id_, self.title, self.type_)
@@ -38,6 +38,8 @@ def invite_link(creator):
        TestChatInviteLink.revoked,
        expire_date=TestChatInviteLink.expire_date,
        member_limit=TestChatInviteLink.member_limit,
+        name=TestChatInviteLink.name,
+        pending_join_request_count=TestChatInviteLink.pending_join_request_count,
    )


@@ -48,6 +50,8 @@ class TestChatInviteLink:
    revoked = False
    expire_date = datetime.datetime.utcnow()
    member_limit = 42
+    name = 'LinkName'
+    pending_join_request_count = 42

    def test_slot_behaviour(self, recwarn, mro_slots, invite_link):
        for attr in invite_link.__slots__:
@@ -79,7 +83,9 @@ class TestChatInviteLink:
            'is_primary': self.primary,
            'is_revoked': self.revoked,
            'expire_date': to_timestamp(self.expire_date),
-            'member_limit': self.member_limit,
+            'member_limit': str(self.member_limit),
+            'name': self.name,
+            'pending_join_request_count': str(self.pending_join_request_count),
        }

        invite_link = ChatInviteLink.de_json(json_dict, bot)
@@ -91,6 +97,8 @@ class TestChatInviteLink:
        assert pytest.approx(invite_link.expire_date == self.expire_date)
        assert to_timestamp(invite_link.expire_date) == to_timestamp(self.expire_date)
        assert invite_link.member_limit == self.member_limit
+        assert invite_link.name == self.name
+        assert invite_link.pending_join_request_count == self.pending_join_request_count

    def test_to_dict(self, invite_link):
        invite_link_dict = invite_link.to_dict()
@@ -101,6 +109,8 @@ class TestChatInviteLink:
        assert invite_link_dict['is_revoked'] == self.revoked
        assert invite_link_dict['expire_date'] == to_timestamp(self.expire_date)
        assert invite_link_dict['member_limit'] == self.member_limit
+        assert invite_link_dict['name'] == self.name
+        assert invite_link_dict['pending_join_request_count'] == self.pending_join_request_count

    def test_equality(self):
        a = ChatInviteLink("link", User(1, '', False), True, True)
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+import datetime
+
+import pytest
+import pytz
+
+from telegram import ChatJoinRequest, User, Chat, ChatInviteLink, Bot
+from telegram.utils.helpers import to_timestamp
+from tests.conftest import check_shortcut_signature, check_shortcut_call, check_defaults_handling
+
+
+@pytest.fixture(scope='class')
+def time():
+    return datetime.datetime.now(tz=pytz.utc)
+
+
+@pytest.fixture(scope='class')
+def chat_join_request(bot, time):
+    return ChatJoinRequest(
+        chat=TestChatJoinRequest.chat,
+        from_user=TestChatJoinRequest.from_user,
+        date=time,
+        bio=TestChatJoinRequest.bio,
+        invite_link=TestChatJoinRequest.invite_link,
+        bot=bot,
+    )
+
+
+class TestChatJoinRequest:
+    chat = Chat(1, Chat.SUPERGROUP)
+    from_user = User(2, 'first_name', False)
+    bio = 'bio'
+    invite_link = ChatInviteLink(
+        'https://invite.link',
+        User(42, 'creator', False),
+        name='InviteLink',
+        is_revoked=False,
+        is_primary=False,
+    )
+
+    def test_slot_behaviour(self, chat_join_request, recwarn, mro_slots):
+        inst = chat_join_request
+        for attr in inst.__slots__:
+            assert getattr(inst, attr, 'err') != 'err', f"got extra slot '{attr}'"
+        assert not inst.__dict__, f"got missing slot(s): {inst.__dict__}"
+        assert len(mro_slots(inst)) == len(set(mro_slots(inst))), "duplicate slot"
+        inst.custom, inst.bio = 'should give warning', self.bio
+        assert len(recwarn) == 1 and 'custom' in str(recwarn[0].message), recwarn.list
+
+    def test_de_json(self, bot, time):
+        json_dict = {
+            'chat': self.chat.to_dict(),
+            'from': self.from_user.to_dict(),
+            'date': to_timestamp(time),
+        }
+        chat_join_request = ChatJoinRequest.de_json(json_dict, bot)
+
+        assert chat_join_request.chat == self.chat
+        assert chat_join_request.from_user == self.from_user
+        assert pytest.approx(chat_join_request.date == time)
+        assert to_timestamp(chat_join_request.date) == to_timestamp(time)
+
+        json_dict.update({'bio': self.bio, 'invite_link': self.invite_link.to_dict()})
+        chat_join_request = ChatJoinRequest.de_json(json_dict, bot)
+
+        assert chat_join_request.chat == self.chat
+        assert chat_join_request.from_user == self.from_user
+        assert pytest.approx(chat_join_request.date == time)
+        assert to_timestamp(chat_join_request.date) == to_timestamp(time)
+        assert chat_join_request.bio == self.bio
+        assert chat_join_request.invite_link == self.invite_link
+
+    def test_to_dict(self, chat_join_request, time):
+        chat_join_request_dict = chat_join_request.to_dict()
+
+        assert isinstance(chat_join_request_dict, dict)
+        assert chat_join_request_dict['chat'] == chat_join_request.chat.to_dict()
+        assert chat_join_request_dict['from'] == chat_join_request.from_user.to_dict()
+        assert chat_join_request_dict['date'] == to_timestamp(chat_join_request.date)
+        assert chat_join_request_dict['bio'] == chat_join_request.bio
+        assert chat_join_request_dict['invite_link'] == chat_join_request.invite_link.to_dict()
+
+    def test_equality(self, chat_join_request, time):
+        a = chat_join_request
+        b = ChatJoinRequest(self.chat, self.from_user, time)
+        c = ChatJoinRequest(self.chat, self.from_user, time, bio='bio')
+        d = ChatJoinRequest(self.chat, self.from_user, time + datetime.timedelta(1))
+        e = ChatJoinRequest(self.chat, User(-1, 'last_name', True), time)
+        f = User(456, '', False)
+
+        assert a == b
+        assert hash(a) == hash(b)
+        assert a is not b
+
+        assert a == c
+        assert hash(a) == hash(c)
+
+        assert a != d
+        assert hash(a) != hash(d)
+
+        assert a != e
+        assert hash(a) != hash(e)
+
+        assert a != f
+        assert hash(a) != hash(f)
+
+    def test_approve(self, monkeypatch, chat_join_request):
+        def make_assertion(*_, **kwargs):
+            chat_id_test = kwargs['chat_id'] == chat_join_request.chat.id
+            user_id_test = kwargs['user_id'] == chat_join_request.from_user.id
+
+            return chat_id_test and user_id_test
+
+        assert check_shortcut_signature(
+            ChatJoinRequest.approve, Bot.approve_chat_join_request, ['chat_id', 'user_id'], []
+        )
+        assert check_shortcut_call(
+            chat_join_request.approve, chat_join_request.bot, 'approve_chat_join_request'
+        )
+        assert check_defaults_handling(chat_join_request.approve, chat_join_request.bot)
+
+        monkeypatch.setattr(chat_join_request.bot, 'approve_chat_join_request', make_assertion)
+        assert chat_join_request.approve()
+
+    def test_decline(self, monkeypatch, chat_join_request):
+        def make_assertion(*_, **kwargs):
+            chat_id_test = kwargs['chat_id'] == chat_join_request.chat.id
+            user_id_test = kwargs['user_id'] == chat_join_request.from_user.id
+
+            return chat_id_test and user_id_test
+
+        assert check_shortcut_signature(
+            ChatJoinRequest.decline, Bot.decline_chat_join_request, ['chat_id', 'user_id'], []
+        )
+        assert check_shortcut_call(
+            chat_join_request.decline, chat_join_request.bot, 'decline_chat_join_request'
+        )
+        assert check_defaults_handling(chat_join_request.decline, chat_join_request.bot)
+
+        monkeypatch.setattr(chat_join_request.bot, 'decline_chat_join_request', make_assertion)
+        assert chat_join_request.decline()
@@ -0,0 +1,219 @@
+#!/usr/bin/env python
+#
+# A library that provides a Python interface to the Telegram Bot API
+# Copyright (C) 2015-2021
+# Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser Public License for more details.
+#
+# You should have received a copy of the GNU Lesser Public License
+# along with this program.  If not, see [http://www.gnu.org/licenses/].
+import datetime
+from queue import Queue
+
+import pytest
+import pytz
+
+from telegram import (
+    Update,
+    Bot,
+    Message,
+    User,
+    Chat,
+    CallbackQuery,
+    ChosenInlineResult,
+    ShippingQuery,
+    PreCheckoutQuery,
+    ChatJoinRequest,
+    ChatInviteLink,
+)
+from telegram.ext import CallbackContext, JobQueue, ChatJoinRequestHandler
+
+
+message = Message(1, None, Chat(1, ''), from_user=User(1, '', False), text='Text')
+
+params = [
+    {'message': message},
+    {'edited_message': message},
+    {'callback_query': CallbackQuery(1, User(1, '', False), 'chat', message=message)},
+    {'channel_post': message},
+    {'edited_channel_post': message},
+    {'chosen_inline_result': ChosenInlineResult('id', User(1, '', False), '')},
+    {'shipping_query': ShippingQuery('id', User(1, '', False), '', None)},
+    {'pre_checkout_query': PreCheckoutQuery('id', User(1, '', False), '', 0, '')},
+    {'callback_query': CallbackQuery(1, User(1, '', False), 'chat')},
+]
+
+ids = (
+    'message',
+    'edited_message',
+    'callback_query',
+    'channel_post',
+    'edited_channel_post',
+    'chosen_inline_result',
+    'shipping_query',
+    'pre_checkout_query',
+    'callback_query_without_message',
+)
+
+
+@pytest.fixture(scope='class', params=params, ids=ids)
+def false_update(request):
+    return Update(update_id=2, **request.param)
+
+
+@pytest.fixture(scope='class')
+def time():
+    return datetime.datetime.now(tz=pytz.utc)
+
+
+@pytest.fixture(scope='class')
+def chat_join_request(time, bot):
+    return ChatJoinRequest(
+        chat=Chat(1, Chat.SUPERGROUP),
+        from_user=User(2, 'first_name', False),
+        date=time,
+        bio='bio',
+        invite_link=ChatInviteLink(
+            'https://invite.link',
+            User(42, 'creator', False),
+            name='InviteLink',
+            is_revoked=False,
+            is_primary=False,
+        ),
+        bot=bot,
+    )
+
+
+@pytest.fixture(scope='function')
+def chat_join_request_update(bot, chat_join_request):
+    return Update(0, chat_join_request=chat_join_request)
+
+
+class TestChatJoinRequestHandler:
+    test_flag = False
+
+    def test_slot_behaviour(self, recwarn, mro_slots):
+        action = ChatJoinRequestHandler(self.callback_basic)
+        for attr in action.__slots__:
+            assert getattr(action, attr, 'err') != 'err', f"got extra slot '{attr}'"
+        assert not action.__dict__, f"got missing slot(s): {action.__dict__}"
+        assert len(mro_slots(action)) == len(set(mro_slots(action))), "duplicate slot"
+        action.custom = 'should give warning'
+        assert len(recwarn) == 1 and 'custom' in str(recwarn[0].message), recwarn.list
+
+    @pytest.fixture(autouse=True)
+    def reset(self):
+        self.test_flag = False
+
+    def callback_basic(self, bot, update):
+        test_bot = isinstance(bot, Bot)
+        test_update = isinstance(update, Update)
+        self.test_flag = test_bot and test_update
+
+    def callback_data_1(self, bot, update, user_data=None, chat_data=None):
+        self.test_flag = (user_data is not None) or (chat_data is not None)
+
+    def callback_data_2(self, bot, update, user_data=None, chat_data=None):
+        self.test_flag = (user_data is not None) and (chat_data is not None)
+
+    def callback_queue_1(self, bot, update, job_queue=None, update_queue=None):
+        self.test_flag = (job_queue is not None) or (update_queue is not None)
+
+    def callback_queue_2(self, bot, update, job_queue=None, update_queue=None):
+        self.test_flag = (job_queue is not None) and (update_queue is not None)
+
+    def callback_context(self, update, context):
+        self.test_flag = (
+            isinstance(context, CallbackContext)
+            and isinstance(context.bot, Bot)
+            and isinstance(update, Update)
+            and isinstance(context.update_queue, Queue)
+            and isinstance(context.job_queue, JobQueue)
+            and isinstance(context.user_data, dict)
+            and isinstance(context.chat_data, dict)
+            and isinstance(context.bot_data, dict)
+            and isinstance(
+                update.chat_join_request,
+                ChatJoinRequest,
+            )
+        )
+
+    def test_basic(self, dp, chat_join_request_update):
+        handler = ChatJoinRequestHandler(self.callback_basic)
+        dp.add_handler(handler)
+
+        assert handler.check_update(chat_join_request_update)
+
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+    def test_pass_user_or_chat_data(self, dp, chat_join_request_update):
+        handler = ChatJoinRequestHandler(self.callback_data_1, pass_user_data=True)
+        dp.add_handler(handler)
+
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+        dp.remove_handler(handler)
+        handler = ChatJoinRequestHandler(self.callback_data_1, pass_chat_data=True)
+        dp.add_handler(handler)
+
+        self.test_flag = False
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+        dp.remove_handler(handler)
+        handler = ChatJoinRequestHandler(
+            self.callback_data_2, pass_chat_data=True, pass_user_data=True
+        )
+        dp.add_handler(handler)
+
+        self.test_flag = False
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+    def test_pass_job_or_update_queue(self, dp, chat_join_request_update):
+        handler = ChatJoinRequestHandler(self.callback_queue_1, pass_job_queue=True)
+        dp.add_handler(handler)
+
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+        dp.remove_handler(handler)
+        handler = ChatJoinRequestHandler(self.callback_queue_1, pass_update_queue=True)
+        dp.add_handler(handler)
+
+        self.test_flag = False
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+        dp.remove_handler(handler)
+        handler = ChatJoinRequestHandler(
+            self.callback_queue_2, pass_job_queue=True, pass_update_queue=True
+        )
+        dp.add_handler(handler)
+
+        self.test_flag = False
+        dp.process_update(chat_join_request_update)
+        assert self.test_flag
+
+    def test_other_update_types(self, false_update):
+        handler = ChatJoinRequestHandler(self.callback_basic)
+        assert not handler.check_update(false_update)
+        assert not handler.check_update(True)
+
+    def test_context(self, cdp, chat_join_request_update):
+        handler = ChatJoinRequestHandler(callback=self.callback_context)
+        cdp.add_handler(handler)
+
+        cdp.process_update(chat_join_request_update)
+        assert self.test_flag
@@ -591,6 +591,21 @@ class TestSendMediaGroup:
        )
        assert isinstance(new_message, Message)

+    def test_edit_message_media_with_thumb(
+        self, bot, chat_id, video_file, photo_file, monkeypatch  # noqa: F811
+    ):
+        def test(*args, **kwargs):
+            data = kwargs['fields']
+            video_check = data[input_video.media.attach] == input_video.media.field_tuple
+            thumb_check = data[input_video.thumb.attach] == input_video.thumb.field_tuple
+            result = video_check and thumb_check
+            raise Exception(f"Test was {'successful' if result else 'failing'}")
+
+        monkeypatch.setattr('telegram.utils.request.Request._request_wrapper', test)
+        input_video = InputMediaVideo(video_file, thumb=photo_file)
+        with pytest.raises(Exception, match='Test was successful'):
+            bot.edit_message_media(chat_id=chat_id, message_id=123, media=input_video)
+
    @flaky(3, 1)
    @pytest.mark.parametrize(
        'default_bot', [{'parse_mode': ParseMode.HTML}], indirect=True, ids=['HTML-Bot']
@@ -32,6 +32,7 @@ import logging
 import os
 import pickle
 from collections import defaultdict
+from collections.abc import Container
 from time import sleep
 from sys import version_info as py_ver

@@ -566,17 +567,32 @@ class TestBasePersistence:

            def __init__(self):
                self.bot = bot
-                self.not_in_dict = bot
+                self.not_in_slots = bot

            def __eq__(self, other):
                if isinstance(other, CustomSlottedClass):
-                    return self.bot is other.bot and self.not_in_dict is other.not_in_dict
+                    return self.bot is other.bot and self.not_in_slots is other.not_in_slots
+                return False
+
+        class DictNotInSlots(Container):
+            """This classes parent has slots, but __dict__ is not in those slots."""
+
+            def __init__(self):
+                self.bot = bot
+
+            def __contains__(self, item):
+                return True
+
+            def __eq__(self, other):
+                if isinstance(other, DictNotInSlots):
+                    return self.bot is other.bot
                return False

        class CustomClass:
            def __init__(self):
                self.bot = bot
                self.slotted_object = CustomSlottedClass()
+                self.dict_not_in_slots_object = DictNotInSlots()
                self.list_ = [1, 2, bot]
                self.tuple_ = tuple(self.list_)
                self.set_ = set(self.list_)
@@ -589,7 +605,8 @@ class TestBasePersistence:
                cc = CustomClass()
                cc.bot = BasePersistence.REPLACED_BOT
                cc.slotted_object.bot = BasePersistence.REPLACED_BOT
-                cc.slotted_object.not_in_dict = BasePersistence.REPLACED_BOT
+                cc.slotted_object.not_in_slots = BasePersistence.REPLACED_BOT
+                cc.dict_not_in_slots_object.bot = BasePersistence.REPLACED_BOT
                cc.list_ = [1, 2, BasePersistence.REPLACED_BOT]
                cc.tuple_ = tuple(cc.list_)
                cc.set_ = set(cc.list_)
@@ -603,6 +620,7 @@ class TestBasePersistence:
                    return (
                        self.bot is other.bot
                        and self.slotted_object == other.slotted_object
+                        and self.dict_not_in_slots_object == other.dict_not_in_slots_object
                        and self.list_ == other.list_
                        and self.tuple_ == other.tuple_
                        and self.set_ == other.set_
@@ -34,6 +34,7 @@ from telegram import (
    PollOption,
    ChatMemberUpdated,
    ChatMember,
+    ChatJoinRequest,
 )
 from telegram.poll import PollAnswer
 from telegram.utils.helpers import from_timestamp
@@ -47,6 +48,14 @@ chat_member_updated = ChatMemberUpdated(
    ChatMember(User(1, '', False), ChatMember.CREATOR),
 )

+
+chat_join_request = ChatJoinRequest(
+    chat=Chat(1, Chat.SUPERGROUP),
+    from_user=User(1, 'first_name', False),
+    date=from_timestamp(int(time.time())),
+    bio='bio',
+)
+
 params = [
    {'message': message},
    {'edited_message': message},
@@ -57,11 +66,13 @@ params = [
    {'chosen_inline_result': ChosenInlineResult('id', User(1, '', False), '')},
    {'shipping_query': ShippingQuery('id', User(1, '', False), '', None)},
    {'pre_checkout_query': PreCheckoutQuery('id', User(1, '', False), '', 0, '')},
-    {'callback_query': CallbackQuery(1, User(1, '', False), 'chat')},
    {'poll': Poll('id', '?', [PollOption('.', 1)], False, False, False, Poll.REGULAR, True)},
    {'poll_answer': PollAnswer("id", User(1, '', False), [1])},
    {'my_chat_member': chat_member_updated},
    {'chat_member': chat_member_updated},
+    {'chat_join_request': chat_join_request},
+    # Must be last to conform with `ids` below!
+    {'callback_query': CallbackQuery(1, User(1, '', False), 'chat')},
 ]

 all_types = (
@@ -78,6 +89,7 @@ all_types = (
    'poll_answer',
    'my_chat_member',
    'chat_member',
+    'chat_join_request',
 )

 ids = all_types + ('callback_query_without_message',)
@@ -171,6 +183,7 @@ class TestUpdate:
            or update.poll_answer is not None
            or update.my_chat_member is not None
            or update.chat_member is not None
+            or update.chat_join_request is not None
        ):
            assert eff_message.message_id == message.message_id
        else:
@@ -430,6 +430,40 @@ class TestUser:
        monkeypatch.setattr(user.bot, 'copy_message', make_assertion)
        assert user.copy_message(chat_id='chat_id', message_id='message_id')

+    def test_instance_method_approve_join_request(self, monkeypatch, user):
+        def make_assertion(*_, **kwargs):
+            chat_id = kwargs['chat_id'] == 'chat_id'
+            user_id = kwargs['user_id'] == user.id
+            return chat_id and user_id
+
+        assert check_shortcut_signature(
+            User.approve_join_request, Bot.approve_chat_join_request, ['user_id'], []
+        )
+        assert check_shortcut_call(
+            user.approve_join_request, user.bot, 'approve_chat_join_request'
+        )
+        assert check_defaults_handling(user.approve_join_request, user.bot)
+
+        monkeypatch.setattr(user.bot, 'approve_chat_join_request', make_assertion)
+        assert user.approve_join_request(chat_id='chat_id')
+
+    def test_instance_method_decline_join_request(self, monkeypatch, user):
+        def make_assertion(*_, **kwargs):
+            chat_id = kwargs['chat_id'] == 'chat_id'
+            user_id = kwargs['user_id'] == user.id
+            return chat_id and user_id
+
+        assert check_shortcut_signature(
+            User.decline_join_request, Bot.decline_chat_join_request, ['user_id'], []
+        )
+        assert check_shortcut_call(
+            user.decline_join_request, user.bot, 'decline_chat_join_request'
+        )
+        assert check_defaults_handling(user.decline_join_request, user.bot)
+
+        monkeypatch.setattr(user.bot, 'decline_chat_join_request', make_assertion)
+        assert user.decline_join_request(chat_id='chat_id')
+
    def test_mention_html(self, user):
        expected = '<a href="tg://user?id={}">{}</a>'
Author	SHA1	Message	Date
Hinrich Mahler	51a4a6664c	Bump version to v13.8	2021-11-08 19:12:10 +01:00
Bibo-Joshi	e4dc80f41d	API 5.4 (#2767 ) Co-authored-by: poolitzer <25934244+Poolitzer@users.noreply.github.com>	2021-11-08 19:02:20 +01:00
Abshar Mohammed Aslam	bc7c422a11	Create Issue Template Forms (#2689 )	2021-10-03 20:08:04 +02:00
Yan	c3e3bb77e5	Fix camelCase Functions in ExtBot (#2659 ) Co-authored-by: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>	2021-09-15 17:07:11 +02:00
DonalDuck004	a25c76e6a3	Fix Empty Captions not Being Passed by Bot.copy_message (#2651 )	2021-09-09 07:50:04 +02:00
Mehdi	0c5085022c	Fix Setting Thumbs When Uploading A Single File (#2583 ) * Update request.py If the media has a thumb, we also need to attach it to the data. * Add test * Editing syntax * Debug test * update request.py * Update test_inputmedia.py * Update test_inputmedia.py * Update test_inputmedia.py Fix test. * Update AUTHORS.rst Adding my name! * Update AUTHORS.rst	2021-08-11 08:34:47 +02:00
Bibo-Joshi	1fdaaac809	Fix Bug in BasePersistence.insert/replace_bot for Objects with __dict__ not in __slots__ (#2603 ) * More special cases with slots * Fix failing tests	2021-07-24 17:17:25 +02:00