Skip to content

blockquote message entity api-7.0. #4038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bibo-Joshi merged 11 commits into from
Jan 8, 2024
Merged

blockquote message entity api-7.0. #4038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7fdea9f
Add `blockquote` message entity.
aelkheir Dec 30, 2023
12c19aa
Merge remote-tracking branch 'upstream/api-7.0' into blockquote-api-7.0
aelkheir Dec 31, 2023
1d5c3b1
Update `Message._parse(html/markdown)` to account for 'blockquote'
aelkheir Dec 31, 2023
0af70b3
Adapt tests to include `blockquote` message entity
aelkheir Dec 31, 2023
ba9cfcf
Add support for parsing multi-line blockquotes
aelkheir Jan 5, 2024
877d6d6
Merge remote-tracking branch 'upstream/api-7.0' into blockquote-api-7.0
aelkheir Jan 5, 2024
0dd0529
Try fixing blockquote things and clean up `Message._parse_*` in the p…
Bibo-Joshi Jan 6, 2024
dd8f9c5
Revert "Try fixing blockquote things and clean up `Message._parse_*` …
Bibo-Joshi Jan 8, 2024
b0d2ef5
Revert "Add support for parsing multi-line blockquotes"
Bibo-Joshi Jan 8, 2024
71024d2
Revert "Adapt tests to include `blockquote` message entity"
Bibo-Joshi Jan 8, 2024
961d271
Revert "Update `Message._parse(html/markdown)` to account for 'blockq…
Bibo-Joshi Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions telegram/_messageentity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,15 @@ class MessageEntity(TelegramObject):
:attr:`EMAIL` (do-not-reply@telegram.org), :attr:`PHONE_NUMBER` (+1-212-555-0123),
:attr:`BOLD` (**bold text**), :attr:`ITALIC` (*italic text*), :attr:`UNDERLINE`
(underlined text), :attr:`STRIKETHROUGH`, :attr:`SPOILER` (spoiler message),
:attr:`CODE` (monowidth string), :attr:`PRE` (monowidth block), :attr:`TEXT_LINK`
(for clickable text URLs), :attr:`TEXT_MENTION` (for users without usernames),
:attr:`CUSTOM_EMOJI` (for inline custom emoji stickers).
:attr:`BLOCKQUOTE` (block quotation), :attr:`CODE` (monowidth string), :attr:`PRE`
(monowidth block), :attr:`TEXT_LINK` (for clickable text URLs), :attr:`TEXT_MENTION`
(for users without usernames), :attr:`CUSTOM_EMOJI` (for inline custom emoji stickers).

.. versionadded:: 20.0
Added inline custom emoji

.. versionadded:: NEXT.VERSION
Added block quotation
offset (:obj:`int`): Offset in UTF-16 code units to the start of the entity.
length (:obj:`int`): Length of the entity in UTF-16 code units.
url (:obj:`str`, optional): For :attr:`TEXT_LINK` only, url that will be opened after
Expand All @@ -71,12 +74,15 @@ class MessageEntity(TelegramObject):
:attr:`EMAIL` (do-not-reply@telegram.org), :attr:`PHONE_NUMBER` (+1-212-555-0123),
:attr:`BOLD` (**bold text**), :attr:`ITALIC` (*italic text*), :attr:`UNDERLINE`
(underlined text), :attr:`STRIKETHROUGH`, :attr:`SPOILER` (spoiler message),
:attr:`CODE` (monowidth string), :attr:`PRE` (monowidth block), :attr:`TEXT_LINK`
(for clickable text URLs), :attr:`TEXT_MENTION` (for users without usernames),
:attr:`CUSTOM_EMOJI` (for inline custom emoji stickers).
:attr:`BLOCKQUOTE` (block quotation), :attr:`CODE` (monowidth string), :attr:`PRE`
(monowidth block), :attr:`TEXT_LINK` (for clickable text URLs), :attr:`TEXT_MENTION`
(for users without usernames), :attr:`CUSTOM_EMOJI` (for inline custom emoji stickers).

.. versionadded:: 20.0
Added inline custom emoji

.. versionadded:: NEXT.VERSION
Added block quotation
offset (:obj:`int`): Offset in UTF-16 code units to the start of the entity.
length (:obj:`int`): Length of the entity in UTF-16 code units.
url (:obj:`str`): Optional. For :attr:`TEXT_LINK` only, url that will be opened after
Expand Down Expand Up @@ -174,5 +180,10 @@ def de_json(cls, data: Optional[JSONDict], bot: "Bot") -> Optional["MessageEntit

.. versionadded:: 20.0
"""
BLOCKQUOTE: Final[str] = constants.MessageEntityType.BLOCKQUOTE
""":const:`telegram.constants.MessageEntityType.BLOCKQUOTE`

.. versionadded:: NEXT.VERSION
"""
ALL_TYPES: Final[List[str]] = list(constants.MessageEntityType)
"""List[:obj:`str`]: A list of all available message entity types."""
5 changes: 5 additions & 0 deletions telegram/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,6 +1565,11 @@ class MessageEntityType(StringEnum):

.. versionadded:: 20.0
"""
BLOCKQUOTE = "blockquote"
""":obj:`str`: Message entities representing a block quotation.

.. versionadded:: NEXT.VERSION
"""


class MessageLimit(IntEnum):
Expand Down