Skip to content

Blockquote api 7.0 branched #4061

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 12 commits into from
Feb 4, 2024
Merged

Blockquote api 7.0 branched #4061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 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
1fcfc74
Merge branch 'api-7.0' into blockquote-api-7.0-branched
Bibo-Joshi Jan 27, 2024
5a1e5c7
Update docstrings in `Message`
Bibo-Joshi Jan 27, 2024
f75fc09
Update tests
Bibo-Joshi Jan 27, 2024
f9e1548
Make unit tests run
Bibo-Joshi Jan 27, 2024
57a6f2b
Merge branch 'api-7.0' into blockquote-api-7.0-branched
Poolitzer Jan 29, 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
4 changes: 4 additions & 0 deletions .github/workflows/unit_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ on:
pull_request:
branches:
- master
- api-7.0

push:
branches:
- master
- api-7.0

schedule:
# Run monday and friday morning at 03:07 - odd time to spread load on GitHub Actions
- cron: '7 3 * * 1,5'
Expand Down
5 changes: 5 additions & 0 deletions docs/substitutions/global.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@

.. |keyword_only_arg| replace:: In future versions, this argument will become a keyword-only argument.

.. |mutually_exc_rp| replace:: Mutually exclusive with :paramref:`~telegram.Bot.send_message.reply_parameters`.

.. |text_html| replace:: The return value of this property is a best-effort approach. Unfortunately, it can not be guaranteed that sending a message with the returned string will render in the same way as the original message produces the same :attr:`~telegram.Message.entities`/:attr:`~telegram.Message.caption_entities` as the original message. For example, Telegram recommends that entities of type :attr:`~telegram.MessageEntity.BLOCKQUOTE` and :attr:`~telegram.MessageEntity.PRE` *should* start and end on a new line, but does not enforce this and leaves rendering decisions up to the clients.

.. |text_markdown| replace:: |text_html|. Moreover, markdown formatting is inherently less expressive than HTML, so some edge cases may not be coverable at all. For example, markdown formatting can not specify two consecutive block quotes without a blank line in between, but HTML can.
.. |reply_quote| replace:: If set to :obj:`True`, the message is sent as an actual reply to this message. If ``reply_to_message_id`` is passed, this parameter will be ignored. Default: :obj:`True` in group chats and :obj:`False` in private chats.

.. |do_quote| replace:: If set to :obj:`True`, the replied message is quoted. For a dict, it must be the output of :meth:`~telegram.Message.build_reply_arguments` to specify exact ``reply_parameters``.
Loading