Skip to content

Feat: Backport API 6.0 to V13 - #3027

Merged
Bibo-Joshi merged 23 commits into
v13.xfrom
v13_api6.0
May 25, 2022
Merged

Feat: Backport API 6.0 to V13#3027
Bibo-Joshi merged 23 commits into
v13.xfrom
v13_api6.0

Conversation

@Poolitzer

@Poolitzer Poolitzer commented May 12, 2022 •
edited
Loading

Copy link
Copy Markdown
Member

This closes #3004.

Checklist for PRs

  • Added .. versionadded:: version, .. versionchanged:: version or .. deprecated:: version to the docstrings for user facing changes (for methods/class descriptions, arguments and attributes)
  • Created new or adapted existing unit tests
  • Documented code changes according to the CSI standard
  • Added myself alphabetically to AUTHORS.rst (optional)
  • Added new classes & modules to the docs and all suitable __all__ s

If the PR contains API changes (otherwise, you can delete this passage)

  • New classes:

    • Added self._id_attrs and corresponding documentation
    • __init__ accepts **_kwargs

  • Added new shortcuts:

    • In Chat & User for all methods that accept chat/user_id
    • In Message for all methods that accept chat_id and message_id
    • For new Message shortcuts: Added quote argument if methods accepts reply_to_message_id
    • In CallbackQuery for all methods that accept either chat_id and message_id or inline_message_id

  • If relevant:

    • Added new constants at telegram.constants and shortcuts to them as class variables
    • Link new and existing constants in docstrings instead of hard coded number and strings
    • Add new message types to Message.effective_attachment
    • Added new handlers for new update types
      • Add the handlers to the warning loop in the ConversationHandler
    • Added new filters for new message (sub)types
    • Added or updated documentation for the changed class(es) and/or method(s)
    • Added or updated bot_methods.rst
    • Updated the Bot API version number in all places: README.rst and README_RAW.rst (including the badge), as well as telegram.constants.BOT_API_VERSION
    • Added logic for arbitrary callback data in tg.ext.Bot for new methods that either accept a reply_markup in some form or have a return type that is/contains telegram.Message

github-actions[bot]
github-actions Bot reviewed May 12, 2022
View reviewed changes

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey! Looks like you edited the (dev) requirements or the pre-commit hooks. I'm just a friendly reminder to keep the pre-commit hook versions in sync with the dev requirements and the additional dependencies for the hooks in sync with the requirements :)

github-actions[bot]
github-actions Bot reviewed May 12, 2022
View reviewed changes

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey! Looks like you edited README.rst or README_RAW.rst. I'm just a friendly reminder to apply relevant changes to both of those files :)

github-actions[bot]
github-actions Bot reviewed May 12, 2022
View reviewed changes

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there. Relax, I am just a little warning for the maintainers to release directly after merging your PR, otherwise we have broken examples and people might get confused :)

harshil21
harshil21 requested changes May 12, 2022
View reviewed changes

@harshil21 harshil21 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Found some small errors:

Comment thread README.rst Outdated
Comment thread README.rst Outdated
Comment thread docs/source/telegram.menubuttoncommands.rst Outdated
Comment thread telegram/bot.py Outdated
Comment thread telegram/bot.py Outdated
Comment thread telegram/user.py Outdated
Comment thread telegram/message.py Outdated
Comment thread telegram/webappdata.py Outdated
Comment thread tests/test_bot.py Outdated
Comment thread tests/test_official.py Outdated
@harshil21 harshil21 added this to the 13.12 milestone May 12, 2022
@harshil21 harshil21 added βš™οΈ bot-api affected functionality: bot-api πŸ›  backport change type: backport labels May 12, 2022
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread README.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread README.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread README_RAW.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread README_RAW.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread README_RAW.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread telegram/chatadministratorrights.py Outdated
@Poolitzer @harshil21
Apply suggestions from code review
cfac808 
Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread docs/source/telegram.menubuttondefault.rst Outdated
Poolitzer
Poolitzer commented May 12, 2022
View reviewed changes
Comment thread docs/source/telegram.menubuttonwebapp.rst Outdated
@Poolitzer @harshil21
Fix: Proper github url for MenuButtons
44dc5c9 
Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>
@Poolitzer Poolitzer linked an issue May 12, 2022 that may be closed by this pull request
Backport API 6.0 to v13 #3004
Closed
harshil21
harshil21 reviewed May 12, 2022
View reviewed changes
Comment thread telegram/videochat.py
Bibo-Joshi
Bibo-Joshi reviewed May 12, 2022
View reviewed changes

@Bibo-Joshi Bibo-Joshi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great work πŸ‘ some nitpicking below

about pre-commit.ci: we can either tell it to recurse submodules (we'd have to change that on master, I guess) or add something like [skip pre-commit.ci] to the commit messages on v13.x.

Comment thread README.rst Outdated
Comment thread README_RAW.rst Outdated
Comment thread docs/source/telegram.animation.rst Outdated
Comment thread setup.py
Comment thread telegram/bot.py Outdated
Comment thread telegram/chat.py Outdated
Comment thread telegram/chatmember.py
Comment thread telegram/chatmember.py
Comment thread telegram/message.py Outdated
Comment thread telegram/message.py Outdated
@Poolitzer
Fix: address review
43cb8a1 
[skip pre-commit.ci]
Poolitzer added 3 commits May 13, 2022 15:21
@Poolitzer
Merge remote-tracking branch 'origin/v13_api6.0' into v13_api6.0
534062b 
# Conflicts:
#	README.rst
#	README_RAW.rst
#	docs/source/telegram.menubuttoncommands.rst
#	docs/source/telegram.menubuttondefault.rst
#	docs/source/telegram.menubuttonwebapp.rst
@Poolitzer
Fix: improve videochatstarted
303a248 
also improve some doc strings
[skip pre-commit.ci]
@Poolitzer
Fix: I broke a test.
d97c8c5 
[skip pre-commit.ci]
Bibo-Joshi
Bibo-Joshi reviewed May 13, 2022
View reviewed changes

@Bibo-Joshi Bibo-Joshi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pre-commit is failing because there's a py36 related workaround still in ext.__init__, please remove that. otherwise LGTM from my side.

@Bibo-Joshi

Bibo-Joshi commented May 13, 2022

Copy link
Copy Markdown
Member

ps: [skip pre-commit.ci] apparently has no effect? what's up with deppsource?

@Poolitzer Telegram GithubBot Revised

Poolitzer commented May 13, 2022

Copy link
Copy Markdown
Member Author

@Bibo-Joshi Both of them unrelated to my changes I think.

Bibo-Joshi
Bibo-Joshi reviewed May 14, 2022
View reviewed changes

@Bibo-Joshi Bibo-Joshi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just see that codecov marks some of eth "mutually exclusive" tests as uncovered - can you add corresponding tests?

I told deepsource to ignore the 3 issues. for pre-commit, can you try one of the other documented comments and/or putting it into the first line of the commit message? If neither of that works, I'll probably change the submodules setting on master …

Comment thread telegram/ext/__init__.py
harshil21
harshil21 reviewed May 18, 2022
View reviewed changes
Comment thread tests/test_message.py
Bibo-Joshi
Bibo-Joshi reviewed May 19, 2022
View reviewed changes

@Bibo-Joshi Bibo-Joshi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for pre-commit, can you try one of the other documented comments and/or putting it into the first line of the commit message? If neither of that works, I'll probably change the submodules setting on master …

Comment thread tests/test_chatmember.py Outdated
@Bibo-Joshi
Bibo-Joshi merged commit ef2a052 into v13.x May 25, 2022
@Bibo-Joshi
Bibo-Joshi deleted the v13_api6.0 branch May 25, 2022 15:40
@Hoseinnikvarz Hoseinnikvarz mentioned this pull request Jun 1, 2022
Open
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 1, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@Bibo-Joshi Bibo-Joshi Bibo-Joshi left review comments
@harshil21 harshil21 harshil21 requested changes
@github-actions github-actions[bot] github-actions[bot] left review comments

Assignees

No one assigned

Labels

πŸ›  backport change type: backport βš™οΈ bot-api affected functionality: bot-api

Projects

None yet

Milestone

13.12

Development

Successfully merging this pull request may close these issues.

Backport API 6.0 to v13

3 participants

@Poolitzer @Bibo-Joshi @harshil21