2016-09-07 08:49:09 +02:00
|
|
|
#!/usr/bin/env python
|
|
|
|
#
|
|
|
|
# A library that provides a Python interface to the Telegram Bot API
|
2023-01-01 21:31:29 +01:00
|
|
|
# Copyright (C) 2015-2023
|
2016-09-07 08:49:09 +02:00
|
|
|
# Leandro Toledo de Souza <devs@python-telegram-bot.org>
|
|
|
|
#
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
2017-08-11 23:58:41 +02:00
|
|
|
# it under the terms of the GNU Lesser Public License as published by
|
2016-09-07 08:49:09 +02:00
|
|
|
# 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
|
2017-08-11 23:58:41 +02:00
|
|
|
# GNU Lesser Public License for more details.
|
2016-09-07 08:49:09 +02:00
|
|
|
#
|
2017-08-11 23:58:41 +02:00
|
|
|
# You should have received a copy of the GNU Lesser Public License
|
2016-09-07 08:49:09 +02:00
|
|
|
# along with this program. If not, see [http://www.gnu.org/licenses/].
|
2022-12-15 15:00:36 +01:00
|
|
|
from copy import copy
|
2017-08-11 23:58:41 +02:00
|
|
|
from datetime import datetime
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
from telegram import (
|
2022-05-05 09:27:54 +02:00
|
|
|
Animation,
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
Audio,
|
2022-05-05 09:27:54 +02:00
|
|
|
Bot,
|
|
|
|
Chat,
|
2023-02-08 11:47:21 +01:00
|
|
|
ChatShared,
|
2022-05-05 09:27:54 +02:00
|
|
|
Contact,
|
|
|
|
Dice,
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
Document,
|
2017-08-11 23:58:41 +02:00
|
|
|
Game,
|
2020-04-10 19:22:45 +02:00
|
|
|
Invoice,
|
2022-05-05 09:27:54 +02:00
|
|
|
Location,
|
|
|
|
Message,
|
|
|
|
MessageAutoDeleteTimerChanged,
|
|
|
|
MessageEntity,
|
2020-04-10 19:22:45 +02:00
|
|
|
PassportData,
|
2022-05-05 09:27:54 +02:00
|
|
|
PhotoSize,
|
2020-04-10 19:22:45 +02:00
|
|
|
Poll,
|
|
|
|
PollOption,
|
2020-11-29 16:20:46 +01:00
|
|
|
ProximityAlertTriggered,
|
2022-05-05 09:27:54 +02:00
|
|
|
Sticker,
|
|
|
|
SuccessfulPayment,
|
|
|
|
Update,
|
|
|
|
User,
|
2023-02-08 11:47:21 +01:00
|
|
|
UserShared,
|
2022-05-05 09:27:54 +02:00
|
|
|
Venue,
|
|
|
|
Video,
|
2022-05-03 18:21:50 +02:00
|
|
|
VideoChatEnded,
|
|
|
|
VideoChatParticipantsInvited,
|
|
|
|
VideoChatScheduled,
|
2022-05-05 09:27:54 +02:00
|
|
|
VideoChatStarted,
|
|
|
|
VideoNote,
|
|
|
|
Voice,
|
2022-05-03 18:21:50 +02:00
|
|
|
WebAppData,
|
2020-04-10 19:22:45 +02:00
|
|
|
)
|
2022-05-05 09:27:54 +02:00
|
|
|
from telegram.constants import ChatAction, ParseMode
|
2020-07-19 17:47:26 +02:00
|
|
|
from telegram.ext import Defaults
|
2022-12-12 10:51:33 +01:00
|
|
|
from tests.auxil.bot_method_checks import (
|
|
|
|
check_defaults_handling,
|
|
|
|
check_shortcut_call,
|
|
|
|
check_shortcut_signature,
|
|
|
|
)
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
from tests.test_passport import RAW_PASSPORT_DATA
|
2017-08-11 23:58:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
@pytest.fixture(scope="class")
|
|
|
|
def message(bot):
|
2022-10-07 11:51:53 +02:00
|
|
|
message = Message(
|
2022-05-18 17:18:44 +02:00
|
|
|
message_id=TestMessage.id_,
|
|
|
|
date=TestMessage.date,
|
2022-12-15 15:00:36 +01:00
|
|
|
chat=copy(TestMessage.chat),
|
|
|
|
from_user=copy(TestMessage.from_user),
|
2020-10-06 19:28:40 +02:00
|
|
|
)
|
2022-10-07 11:51:53 +02:00
|
|
|
message.set_bot(bot)
|
2022-12-15 15:00:36 +01:00
|
|
|
message._unfreeze()
|
|
|
|
message.chat._unfreeze()
|
|
|
|
message.from_user._unfreeze()
|
2022-10-07 11:51:53 +02:00
|
|
|
return message
|
2020-10-09 17:22:07 +02:00
|
|
|
|
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
@pytest.fixture(
|
|
|
|
scope="function",
|
2020-10-09 17:22:07 +02:00
|
|
|
params=[
|
2019-11-15 21:51:22 +01:00
|
|
|
{"forward_from": User(99, "forward_user", False), "forward_date": datetime.utcnow()},
|
2017-10-14 20:03:02 +02:00
|
|
|
{
|
|
|
|
"forward_from_chat": Chat(-23, "channel"),
|
|
|
|
"forward_from_message_id": 101,
|
2020-03-28 16:37:26 +01:00
|
|
|
"forward_date": datetime.utcnow(),
|
2017-08-11 23:58:41 +02:00
|
|
|
},
|
2022-11-13 21:28:41 +01:00
|
|
|
{
|
|
|
|
"reply_to_message": Message(
|
|
|
|
50, datetime.utcnow(), Chat(13, "channel"), User(9, "i", False)
|
|
|
|
)
|
|
|
|
},
|
2017-09-01 08:40:05 +02:00
|
|
|
{"edit_date": datetime.utcnow()},
|
2020-10-09 17:22:07 +02:00
|
|
|
{
|
2017-10-14 20:03:02 +02:00
|
|
|
"text": "a text message",
|
2022-10-07 11:51:53 +02:00
|
|
|
"entities": [MessageEntity("bold", 10, 4), MessageEntity("italic", 16, 7)],
|
2017-08-11 23:58:41 +02:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"caption": "A message caption",
|
|
|
|
"caption_entities": [MessageEntity("bold", 1, 1), MessageEntity("text_link", 4, 3)],
|
|
|
|
},
|
2020-03-28 16:37:26 +01:00
|
|
|
{"audio": Audio("audio_id", "unique_id", 12), "caption": "audio_file"},
|
2017-08-11 23:58:41 +02:00
|
|
|
{"document": Document("document_id", "unique_id"), "caption": "document_file"},
|
2017-09-01 08:40:05 +02:00
|
|
|
{
|
2020-03-28 16:37:26 +01:00
|
|
|
"animation": Animation("animation_id", "unique_id", 30, 30, 1),
|
2017-12-08 22:38:59 +01:00
|
|
|
"caption": "animation_file",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
},
|
2020-10-09 17:22:07 +02:00
|
|
|
{
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"game": Game(
|
|
|
|
"my_game",
|
2019-08-23 21:20:41 +02:00
|
|
|
"just my game",
|
2020-02-06 11:22:56 +01:00
|
|
|
[
|
2020-06-22 20:09:52 +02:00
|
|
|
PhotoSize("game_photo_id", "unique_id", 30, 30),
|
2017-08-11 23:58:41 +02:00
|
|
|
],
|
2020-10-09 17:22:07 +02:00
|
|
|
)
|
2017-10-14 20:03:02 +02:00
|
|
|
},
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
{"photo": [PhotoSize("photo_id", "unique_id", 50, 50)], "caption": "photo_file"},
|
2022-08-25 19:36:55 +02:00
|
|
|
{"sticker": Sticker("sticker_id", "unique_id", 50, 50, True, False, Sticker.REGULAR)},
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
{"video": Video("video_id", "unique_id", 12, 12, 12), "caption": "video_file"},
|
|
|
|
{"voice": Voice("voice_id", "unique_id", 5)},
|
|
|
|
{"video_note": VideoNote("video_note_id", "unique_id", 20, 12)},
|
|
|
|
{"new_chat_members": [User(55, "new_user", False)]},
|
|
|
|
{"contact": Contact("phone_numner", "contact_name")},
|
|
|
|
{"location": Location(-23.691288, 46.788279)},
|
|
|
|
{"venue": Venue(Location(-23.691288, 46.788279), "some place", "right here")},
|
|
|
|
{"left_chat_member": User(33, "kicked", False)},
|
|
|
|
{"new_chat_title": "new title"},
|
|
|
|
{"new_chat_photo": [PhotoSize("photo_id", "unique_id", 50, 50)]},
|
|
|
|
{"delete_chat_photo": True},
|
|
|
|
{"group_chat_created": True},
|
|
|
|
{"supergroup_chat_created": True},
|
|
|
|
{"channel_chat_created": True},
|
2021-03-14 16:41:35 +01:00
|
|
|
{"message_auto_delete_timer_changed": MessageAutoDeleteTimerChanged(42)},
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
{"migrate_to_chat_id": -12345},
|
|
|
|
{"migrate_from_chat_id": -54321},
|
2022-11-13 21:28:41 +01:00
|
|
|
{
|
|
|
|
"pinned_message": Message(
|
|
|
|
7, datetime.utcnow(), Chat(13, "channel"), User(9, "i", False)
|
|
|
|
)
|
|
|
|
},
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
{"invoice": Invoice("my invoice", "invoice", "start", "EUR", 243)},
|
2020-10-09 17:22:07 +02:00
|
|
|
{
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"successful_payment": SuccessfulPayment(
|
|
|
|
"EUR", 243, "payload", "charge_id", "provider_id", order_info={}
|
2020-10-09 17:22:07 +02:00
|
|
|
)
|
|
|
|
},
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
{"connected_website": "http://example.com/"},
|
|
|
|
{"forward_signature": "some_forward_sign"},
|
|
|
|
{"author_signature": "some_author_sign"},
|
2020-10-09 17:22:07 +02:00
|
|
|
{
|
2020-02-06 11:22:56 +01:00
|
|
|
"photo": [PhotoSize("photo_id", "unique_id", 50, 50)],
|
|
|
|
"caption": "photo_file",
|
|
|
|
"media_group_id": 1234443322222,
|
2020-10-09 17:22:07 +02:00
|
|
|
},
|
2020-02-06 11:22:56 +01:00
|
|
|
{"passport_data": PassportData.de_json(RAW_PASSPORT_DATA, None)},
|
2020-10-09 17:22:07 +02:00
|
|
|
{
|
2020-02-06 11:22:56 +01:00
|
|
|
"poll": Poll(
|
2019-08-23 21:20:41 +02:00
|
|
|
id="abc",
|
|
|
|
question="What is this?",
|
|
|
|
options=[PollOption(text="a", voter_count=1), PollOption(text="b", voter_count=2)],
|
2020-03-29 09:52:30 +02:00
|
|
|
is_closed=False,
|
|
|
|
total_voter_count=0,
|
|
|
|
is_anonymous=False,
|
|
|
|
type=Poll.REGULAR,
|
2020-05-02 11:56:52 +02:00
|
|
|
allows_multiple_answers=True,
|
|
|
|
explanation_entities=[],
|
2020-10-09 17:22:07 +02:00
|
|
|
)
|
|
|
|
},
|
|
|
|
{
|
2017-10-14 20:03:02 +02:00
|
|
|
"text": "a text message",
|
2020-02-06 11:22:56 +01:00
|
|
|
"reply_markup": {
|
2019-08-23 21:20:41 +02:00
|
|
|
"inline_keyboard": [
|
2020-10-09 17:22:07 +02:00
|
|
|
[
|
2019-08-23 21:20:41 +02:00
|
|
|
{"text": "start", "url": "http://google.com"},
|
|
|
|
{"text": "next", "callback_data": "abcd"},
|
2020-10-09 17:22:07 +02:00
|
|
|
],
|
2020-02-06 11:22:56 +01:00
|
|
|
[{"text": "Cancel", "callback_data": "Cancel"}],
|
2020-10-09 17:22:07 +02:00
|
|
|
]
|
|
|
|
},
|
|
|
|
},
|
2020-06-22 20:09:52 +02:00
|
|
|
{"dice": Dice(4, "🎲")},
|
|
|
|
{"via_bot": User(9, "A_Bot", True)},
|
2020-11-29 16:20:46 +01:00
|
|
|
{
|
|
|
|
"proximity_alert_triggered": ProximityAlertTriggered(
|
|
|
|
User(1, "John", False), User(2, "Doe", False), 42
|
|
|
|
)
|
|
|
|
},
|
2022-05-03 18:21:50 +02:00
|
|
|
{"video_chat_scheduled": VideoChatScheduled(datetime.utcnow())},
|
|
|
|
{"video_chat_started": VideoChatStarted()},
|
|
|
|
{"video_chat_ended": VideoChatEnded(100)},
|
2021-03-14 16:41:35 +01:00
|
|
|
{
|
2022-05-03 18:21:50 +02:00
|
|
|
"video_chat_participants_invited": VideoChatParticipantsInvited(
|
2021-03-14 16:41:35 +01:00
|
|
|
[User(1, "Rem", False), User(2, "Emilia", False)]
|
|
|
|
)
|
|
|
|
},
|
2020-11-29 16:20:46 +01:00
|
|
|
{"sender_chat": Chat(-123, "discussion_channel")},
|
2021-12-11 15:21:56 +01:00
|
|
|
{"is_automatic_forward": True},
|
|
|
|
{"has_protected_content": True},
|
2022-04-24 12:38:09 +02:00
|
|
|
{
|
|
|
|
"entities": [
|
|
|
|
MessageEntity(MessageEntity.BOLD, 0, 1),
|
|
|
|
MessageEntity(MessageEntity.TEXT_LINK, 2, 3, url="https://ptb.org"),
|
|
|
|
]
|
|
|
|
},
|
2022-05-03 18:21:50 +02:00
|
|
|
{"web_app_data": WebAppData("some_data", "some_button_text")},
|
2022-11-22 10:43:50 +01:00
|
|
|
{"message_thread_id": 123},
|
2023-02-08 11:47:21 +01:00
|
|
|
{"user_shared": UserShared(1, 2)},
|
|
|
|
{"chat_shared": ChatShared(3, 4)},
|
2020-10-09 17:22:07 +02:00
|
|
|
],
|
|
|
|
ids=[
|
2017-10-14 20:03:02 +02:00
|
|
|
"forwarded_user",
|
|
|
|
"forwarded_channel",
|
2020-10-09 17:22:07 +02:00
|
|
|
"reply",
|
2017-10-14 20:03:02 +02:00
|
|
|
"edited",
|
2020-10-09 17:22:07 +02:00
|
|
|
"text",
|
2017-10-14 20:03:02 +02:00
|
|
|
"caption_entities",
|
2020-10-09 17:22:07 +02:00
|
|
|
"audio",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"document",
|
|
|
|
"animation",
|
2020-10-09 17:22:07 +02:00
|
|
|
"game",
|
|
|
|
"photo",
|
2020-03-28 16:37:26 +01:00
|
|
|
"sticker",
|
2020-10-09 17:22:07 +02:00
|
|
|
"video",
|
|
|
|
"voice",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"video_note",
|
2017-09-01 08:40:05 +02:00
|
|
|
"new_members",
|
2017-08-11 23:58:41 +02:00
|
|
|
"contact",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"location",
|
2020-10-09 17:22:07 +02:00
|
|
|
"venue",
|
2017-09-01 08:40:05 +02:00
|
|
|
"left_member",
|
2017-08-11 23:58:41 +02:00
|
|
|
"new_title",
|
2020-10-09 17:22:07 +02:00
|
|
|
"new_photo",
|
2017-08-11 23:58:41 +02:00
|
|
|
"delete_photo",
|
|
|
|
"group_created",
|
|
|
|
"supergroup_created",
|
|
|
|
"channel_created",
|
2021-03-14 16:41:35 +01:00
|
|
|
"message_auto_delete_timer_changed",
|
2017-08-11 23:58:41 +02:00
|
|
|
"migrated_to",
|
|
|
|
"migrated_from",
|
2020-10-09 17:22:07 +02:00
|
|
|
"pinned",
|
2017-08-11 23:58:41 +02:00
|
|
|
"invoice",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"successful_payment",
|
2018-02-18 16:11:04 +01:00
|
|
|
"connected_website",
|
2017-09-01 08:40:05 +02:00
|
|
|
"forward_signature",
|
2017-12-08 22:38:59 +01:00
|
|
|
"author_signature",
|
2020-02-06 11:22:56 +01:00
|
|
|
"photo_from_media_group",
|
2020-06-22 20:09:52 +02:00
|
|
|
"passport_data",
|
|
|
|
"poll",
|
2017-08-11 23:58:41 +02:00
|
|
|
"reply_markup",
|
2020-06-22 20:09:52 +02:00
|
|
|
"dice",
|
|
|
|
"via_bot",
|
2020-11-29 16:20:46 +01:00
|
|
|
"proximity_alert_triggered",
|
2022-05-03 18:21:50 +02:00
|
|
|
"video_chat_scheduled",
|
|
|
|
"video_chat_started",
|
|
|
|
"video_chat_ended",
|
|
|
|
"video_chat_participants_invited",
|
2020-11-29 16:20:46 +01:00
|
|
|
"sender_chat",
|
2021-12-11 15:21:56 +01:00
|
|
|
"is_automatic_forward",
|
|
|
|
"has_protected_content",
|
2022-04-24 12:38:09 +02:00
|
|
|
"entities",
|
2022-05-03 18:21:50 +02:00
|
|
|
"web_app_data",
|
2022-11-22 10:43:50 +01:00
|
|
|
"message_thread_id",
|
2023-02-08 11:47:21 +01:00
|
|
|
"user_shared",
|
|
|
|
"chat_shared",
|
2020-10-09 17:22:07 +02:00
|
|
|
],
|
2020-06-22 20:09:52 +02:00
|
|
|
)
|
2017-08-11 23:58:41 +02:00
|
|
|
def message_params(bot, request):
|
2022-10-07 11:51:53 +02:00
|
|
|
message = Message(
|
2020-02-23 22:03:58 +01:00
|
|
|
message_id=TestMessage.id_,
|
2017-08-11 23:58:41 +02:00
|
|
|
from_user=TestMessage.from_user,
|
|
|
|
date=TestMessage.date,
|
|
|
|
chat=TestMessage.chat,
|
|
|
|
**request.param,
|
|
|
|
)
|
2022-10-07 11:51:53 +02:00
|
|
|
message.set_bot(bot)
|
|
|
|
return message
|
2017-08-11 23:58:41 +02:00
|
|
|
|
|
|
|
|
2020-06-15 18:20:51 +02:00
|
|
|
class TestMessage:
|
2020-02-23 22:03:58 +01:00
|
|
|
id_ = 1
|
2017-09-01 08:40:05 +02:00
|
|
|
from_user = User(2, "testuser", False)
|
2019-11-15 21:51:22 +01:00
|
|
|
date = datetime.utcnow()
|
2017-08-11 23:58:41 +02:00
|
|
|
chat = Chat(3, "private")
|
|
|
|
test_entities = [
|
|
|
|
{"length": 4, "offset": 10, "type": "bold"},
|
2020-03-28 16:37:26 +01:00
|
|
|
{"length": 3, "offset": 16, "type": "italic"},
|
|
|
|
{"length": 3, "offset": 20, "type": "italic"},
|
2017-08-11 23:58:41 +02:00
|
|
|
{"length": 4, "offset": 25, "type": "code"},
|
2020-03-28 16:37:26 +01:00
|
|
|
{"length": 5, "offset": 31, "type": "text_link", "url": "http://github.com/ab_"},
|
2018-09-25 20:07:55 +02:00
|
|
|
{
|
|
|
|
"length": 12,
|
|
|
|
"offset": 38,
|
|
|
|
"type": "text_mention",
|
2018-11-01 10:18:07 +01:00
|
|
|
"user": User(123456789, "mentioned user", False),
|
|
|
|
},
|
2020-03-29 09:52:30 +02:00
|
|
|
{"length": 3, "offset": 55, "type": "pre", "language": "python"},
|
2020-03-28 16:37:26 +01:00
|
|
|
{"length": 21, "offset": 60, "type": "url"},
|
|
|
|
]
|
|
|
|
test_text = "Test for <bold, ita_lic, code, links, text-mention and pre. http://google.com/ab_"
|
|
|
|
test_entities_v2 = [
|
|
|
|
{"length": 4, "offset": 0, "type": "underline"},
|
|
|
|
{"length": 4, "offset": 10, "type": "bold"},
|
|
|
|
{"length": 7, "offset": 16, "type": "italic"},
|
|
|
|
{"length": 6, "offset": 25, "type": "code"},
|
|
|
|
{"length": 5, "offset": 33, "type": "text_link", "url": r"http://github.com/abc\)def"},
|
|
|
|
{
|
|
|
|
"length": 12,
|
|
|
|
"offset": 40,
|
|
|
|
"type": "text_mention",
|
|
|
|
"user": User(123456789, "mentioned user", False),
|
|
|
|
},
|
|
|
|
{"length": 5, "offset": 57, "type": "pre"},
|
|
|
|
{"length": 17, "offset": 64, "type": "url"},
|
2021-01-12 19:33:26 +01:00
|
|
|
{"length": 41, "offset": 86, "type": "italic"},
|
|
|
|
{"length": 29, "offset": 91, "type": "bold"},
|
|
|
|
{"length": 9, "offset": 101, "type": "strikethrough"},
|
|
|
|
{"length": 10, "offset": 129, "type": "pre", "language": "python"},
|
2022-01-03 08:13:33 +01:00
|
|
|
{"length": 7, "offset": 141, "type": "spoiler"},
|
2020-03-29 09:52:30 +02:00
|
|
|
]
|
2020-06-15 18:20:51 +02:00
|
|
|
test_text_v2 = (
|
|
|
|
r"Test for <bold, ita_lic, \`code, links, text-mention and `\pre. "
|
2022-01-03 08:13:33 +01:00
|
|
|
"http://google.com and bold nested in strk>trgh nested in italic. Python pre. Spoiled."
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2017-08-11 23:58:41 +02:00
|
|
|
test_message = Message(
|
|
|
|
message_id=1,
|
|
|
|
from_user=None,
|
|
|
|
date=None,
|
|
|
|
chat=None,
|
|
|
|
text=test_text,
|
2018-02-22 16:38:54 +01:00
|
|
|
entities=[MessageEntity(**e) for e in test_entities],
|
|
|
|
caption=test_text,
|
|
|
|
caption_entities=[MessageEntity(**e) for e in test_entities],
|
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
test_message_v2 = Message(
|
|
|
|
message_id=1,
|
|
|
|
from_user=None,
|
|
|
|
date=None,
|
|
|
|
chat=None,
|
|
|
|
text=test_text_v2,
|
|
|
|
entities=[MessageEntity(**e) for e in test_entities_v2],
|
|
|
|
caption=test_text_v2,
|
|
|
|
caption_entities=[MessageEntity(**e) for e in test_entities_v2],
|
|
|
|
)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
def test_all_possibilities_de_json_and_to_dict(self, bot, message_params):
|
|
|
|
new = Message.de_json(message_params.to_dict(), bot)
|
2022-10-07 11:51:53 +02:00
|
|
|
assert new.api_kwargs == {}
|
2022-04-24 12:38:09 +02:00
|
|
|
assert new.to_dict() == message_params.to_dict()
|
|
|
|
|
|
|
|
# Checking that none of the attributes are dicts is a best effort approach to ensure that
|
|
|
|
# de_json converts everything to proper classes without having to write special tests for
|
|
|
|
# every single case
|
|
|
|
for slot in new.__slots__:
|
|
|
|
assert not isinstance(new[slot], dict)
|
|
|
|
|
2021-08-19 22:01:10 +02:00
|
|
|
def test_slot_behaviour(self, message, mro_slots):
|
2021-05-29 16:18:16 +02:00
|
|
|
for attr in message.__slots__:
|
|
|
|
assert getattr(message, attr, "err") != "err", f"got extra slot '{attr}'"
|
|
|
|
assert len(mro_slots(message)) == len(set(mro_slots(message))), "duplicate slot"
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_parse_entity(self):
|
2016-09-07 08:49:09 +02:00
|
|
|
text = (
|
|
|
|
b"\\U0001f469\\u200d\\U0001f469\\u200d\\U0001f467"
|
|
|
|
b"\\u200d\\U0001f467\\U0001f431http://google.com"
|
|
|
|
).decode("unicode-escape")
|
2017-08-11 23:58:41 +02:00
|
|
|
entity = MessageEntity(type=MessageEntity.URL, offset=13, length=17)
|
2022-05-18 17:18:44 +02:00
|
|
|
message = Message(
|
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
text=text,
|
|
|
|
entities=[entity],
|
|
|
|
)
|
2017-08-11 23:58:41 +02:00
|
|
|
assert message.parse_entity(entity) == "http://google.com"
|
2016-09-07 08:49:09 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
with pytest.raises(RuntimeError, match="Message has no"):
|
|
|
|
Message(message_id=1, date=self.date, chat=self.chat).parse_entity(entity)
|
|
|
|
|
|
|
|
async def test_parse_caption_entity(self):
|
2017-10-14 20:03:02 +02:00
|
|
|
caption = (
|
|
|
|
b"\\U0001f469\\u200d\\U0001f469\\u200d\\U0001f467"
|
|
|
|
b"\\u200d\\U0001f467\\U0001f431http://google.com"
|
|
|
|
).decode("unicode-escape")
|
|
|
|
entity = MessageEntity(type=MessageEntity.URL, offset=13, length=17)
|
|
|
|
message = Message(
|
2022-05-18 17:18:44 +02:00
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
caption=caption,
|
|
|
|
caption_entities=[entity],
|
2017-10-14 20:03:02 +02:00
|
|
|
)
|
|
|
|
assert message.parse_caption_entity(entity) == "http://google.com"
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
with pytest.raises(RuntimeError, match="Message has no"):
|
|
|
|
Message(message_id=1, date=self.date, chat=self.chat).parse_entity(entity)
|
|
|
|
|
|
|
|
async def test_parse_entities(self):
|
2016-09-07 08:49:09 +02:00
|
|
|
text = (
|
|
|
|
b"\\U0001f469\\u200d\\U0001f469\\u200d\\U0001f467"
|
|
|
|
b"\\u200d\\U0001f467\\U0001f431http://google.com"
|
|
|
|
).decode("unicode-escape")
|
2017-08-11 23:58:41 +02:00
|
|
|
entity = MessageEntity(type=MessageEntity.URL, offset=13, length=17)
|
|
|
|
entity_2 = MessageEntity(type=MessageEntity.BOLD, offset=13, length=1)
|
|
|
|
message = Message(
|
2022-05-18 17:18:44 +02:00
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
text=text,
|
|
|
|
entities=[entity_2, entity],
|
2017-08-11 23:58:41 +02:00
|
|
|
)
|
|
|
|
assert message.parse_entities(MessageEntity.URL) == {entity: "http://google.com"}
|
|
|
|
assert message.parse_entities() == {entity: "http://google.com", entity_2: "h"}
|
2016-09-07 08:49:09 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_parse_caption_entities(self):
|
2017-10-14 20:03:02 +02:00
|
|
|
text = (
|
|
|
|
b"\\U0001f469\\u200d\\U0001f469\\u200d\\U0001f467"
|
|
|
|
b"\\u200d\\U0001f467\\U0001f431http://google.com"
|
|
|
|
).decode("unicode-escape")
|
|
|
|
entity = MessageEntity(type=MessageEntity.URL, offset=13, length=17)
|
|
|
|
entity_2 = MessageEntity(type=MessageEntity.BOLD, offset=13, length=1)
|
|
|
|
message = Message(
|
|
|
|
1,
|
2022-05-18 17:18:44 +02:00
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
2017-10-14 20:03:02 +02:00
|
|
|
caption=text,
|
|
|
|
caption_entities=[entity_2, entity],
|
|
|
|
)
|
|
|
|
assert message.parse_caption_entities(MessageEntity.URL) == {entity: "http://google.com"}
|
2022-04-24 12:38:09 +02:00
|
|
|
assert message.parse_caption_entities() == {
|
|
|
|
entity: "http://google.com",
|
|
|
|
entity_2: "h",
|
|
|
|
}
|
2017-10-14 20:03:02 +02:00
|
|
|
|
2017-05-21 14:00:07 +02:00
|
|
|
def test_text_html_simple(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_html_string = (
|
|
|
|
"<u>Test</u> for <<b>bold</b>, <i>ita_lic</i>, "
|
|
|
|
r"<code>\`code</code>, "
|
|
|
|
r'<a href="http://github.com/abc\)def">links</a>, '
|
2018-09-25 20:07:55 +02:00
|
|
|
'<a href="tg://user?id=123456789">text-mention</a> and '
|
2020-06-15 18:20:51 +02:00
|
|
|
r"<pre>`\pre</pre>. http://google.com "
|
2021-01-12 19:33:26 +01:00
|
|
|
"and <i>bold <b>nested in <s>strk>trgh</s> nested in</b> italic</i>. "
|
2022-01-03 08:13:33 +01:00
|
|
|
'<pre><code class="python">Python pre</code></pre>. '
|
|
|
|
'<span class="tg-spoiler">Spoiled</span>.'
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
text_html = self.test_message_v2.text_html
|
2017-08-11 23:58:41 +02:00
|
|
|
assert text_html == test_html_string
|
|
|
|
|
2018-03-16 21:42:39 +01:00
|
|
|
def test_text_html_empty(self, message):
|
|
|
|
message.text = None
|
|
|
|
message.caption = "test"
|
|
|
|
assert message.text_html is None
|
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
def test_text_html_urled(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_html_string = (
|
|
|
|
"<u>Test</u> for <<b>bold</b>, <i>ita_lic</i>, "
|
|
|
|
r"<code>\`code</code>, "
|
|
|
|
r'<a href="http://github.com/abc\)def">links</a>, '
|
2018-09-25 20:07:55 +02:00
|
|
|
'<a href="tg://user?id=123456789">text-mention</a> and '
|
2020-06-15 18:20:51 +02:00
|
|
|
r'<pre>`\pre</pre>. <a href="http://google.com">http://google.com</a> '
|
2021-01-12 19:33:26 +01:00
|
|
|
"and <i>bold <b>nested in <s>strk>trgh</s> nested in</b> italic</i>. "
|
2022-01-03 08:13:33 +01:00
|
|
|
'<pre><code class="python">Python pre</code></pre>. '
|
|
|
|
'<span class="tg-spoiler">Spoiled</span>.'
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
text_html = self.test_message_v2.text_html_urled
|
2017-08-11 23:58:41 +02:00
|
|
|
assert text_html == test_html_string
|
2017-01-20 20:13:58 +01:00
|
|
|
|
2017-05-21 14:00:07 +02:00
|
|
|
def test_text_markdown_simple(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_md_string = (
|
|
|
|
r"Test for <*bold*, _ita_\__lic_, `code`, "
|
|
|
|
"[links](http://github.com/ab_), "
|
|
|
|
"[text-mention](tg://user?id=123456789) and ```python\npre```. "
|
|
|
|
r"http://google.com/ab\_"
|
|
|
|
)
|
2017-01-20 20:13:58 +01:00
|
|
|
text_markdown = self.test_message.text_markdown
|
2017-08-11 23:58:41 +02:00
|
|
|
assert text_markdown == test_md_string
|
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
def test_text_markdown_v2_simple(self):
|
|
|
|
test_md_string = (
|
|
|
|
r"__Test__ for <*bold*, _ita\_lic_, `\\\`code`, "
|
2020-06-15 18:20:51 +02:00
|
|
|
"[links](http://github.com/abc\\\\\\)def), "
|
|
|
|
"[text\\-mention](tg://user?id=123456789) and ```\\`\\\\pre```\\. "
|
2021-01-12 19:33:26 +01:00
|
|
|
r"http://google\.com and _bold *nested in ~strk\>trgh~ nested in* italic_\. "
|
2022-01-03 08:13:33 +01:00
|
|
|
"```python\nPython pre```\\. ||Spoiled||\\."
|
2020-06-15 18:20:51 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
text_markdown = self.test_message_v2.text_markdown_v2
|
|
|
|
assert text_markdown == test_md_string
|
|
|
|
|
|
|
|
def test_text_markdown_new_in_v2(self, message):
|
|
|
|
message.text = "test"
|
|
|
|
message.entities = [
|
|
|
|
MessageEntity(MessageEntity.BOLD, offset=0, length=4),
|
|
|
|
MessageEntity(MessageEntity.ITALIC, offset=0, length=4),
|
|
|
|
]
|
|
|
|
with pytest.raises(ValueError):
|
|
|
|
assert message.text_markdown
|
|
|
|
|
|
|
|
message.entities = [MessageEntity(MessageEntity.UNDERLINE, offset=0, length=4)]
|
|
|
|
with pytest.raises(ValueError):
|
|
|
|
message.text_markdown
|
|
|
|
|
|
|
|
message.entities = [MessageEntity(MessageEntity.STRIKETHROUGH, offset=0, length=4)]
|
|
|
|
with pytest.raises(ValueError):
|
|
|
|
message.text_markdown
|
|
|
|
|
2022-01-03 08:13:33 +01:00
|
|
|
message.entities = [MessageEntity(MessageEntity.SPOILER, offset=0, length=4)]
|
|
|
|
with pytest.raises(ValueError):
|
|
|
|
message.text_markdown
|
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
message.entities = []
|
|
|
|
|
2018-03-16 21:42:39 +01:00
|
|
|
def test_text_markdown_empty(self, message):
|
|
|
|
message.text = None
|
|
|
|
message.caption = "test"
|
|
|
|
assert message.text_markdown is None
|
2020-03-28 16:37:26 +01:00
|
|
|
assert message.text_markdown_v2 is None
|
2018-03-16 21:42:39 +01:00
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
def test_text_markdown_urled(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_md_string = (
|
|
|
|
r"Test for <*bold*, _ita_\__lic_, `code`, "
|
|
|
|
"[links](http://github.com/ab_), "
|
|
|
|
"[text-mention](tg://user?id=123456789) and ```python\npre```. "
|
2020-03-28 16:37:26 +01:00
|
|
|
"[http://google.com/ab_](http://google.com/ab_)"
|
|
|
|
)
|
2017-08-11 23:58:41 +02:00
|
|
|
text_markdown = self.test_message.text_markdown_urled
|
|
|
|
assert text_markdown == test_md_string
|
2017-01-20 20:13:58 +01:00
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
def test_text_markdown_v2_urled(self):
|
|
|
|
test_md_string = (
|
|
|
|
r"__Test__ for <*bold*, _ita\_lic_, `\\\`code`, "
|
2020-06-15 18:20:51 +02:00
|
|
|
"[links](http://github.com/abc\\\\\\)def), "
|
|
|
|
"[text\\-mention](tg://user?id=123456789) and ```\\`\\\\pre```\\. "
|
2021-01-12 19:33:26 +01:00
|
|
|
r"[http://google\.com](http://google.com) and _bold *nested in ~strk\>trgh~ "
|
2022-01-03 08:13:33 +01:00
|
|
|
"nested in* italic_\\. ```python\nPython pre```\\. ||Spoiled||\\."
|
2020-06-15 18:20:51 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
text_markdown = self.test_message_v2.text_markdown_v2_urled
|
|
|
|
assert text_markdown == test_md_string
|
|
|
|
|
2017-05-21 14:00:07 +02:00
|
|
|
def test_text_html_emoji(self):
|
2017-08-11 23:58:41 +02:00
|
|
|
text = b"\\U0001f469\\u200d\\U0001f469\\u200d ABC".decode("unicode-escape")
|
|
|
|
expected = b"\\U0001f469\\u200d\\U0001f469\\u200d <b>ABC</b>".decode("unicode-escape")
|
|
|
|
bold_entity = MessageEntity(type=MessageEntity.BOLD, offset=7, length=3)
|
|
|
|
message = Message(
|
2022-05-18 17:18:44 +02:00
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
text=text,
|
|
|
|
entities=[bold_entity],
|
2017-08-11 23:58:41 +02:00
|
|
|
)
|
|
|
|
assert expected == message.text_html
|
2017-05-21 14:00:07 +02:00
|
|
|
|
|
|
|
def test_text_markdown_emoji(self):
|
2017-08-11 23:58:41 +02:00
|
|
|
text = b"\\U0001f469\\u200d\\U0001f469\\u200d ABC".decode("unicode-escape")
|
|
|
|
expected = b"\\U0001f469\\u200d\\U0001f469\\u200d *ABC*".decode("unicode-escape")
|
|
|
|
bold_entity = MessageEntity(type=MessageEntity.BOLD, offset=7, length=3)
|
|
|
|
message = Message(
|
|
|
|
1, self.from_user, self.date, self.chat, text=text, entities=[bold_entity]
|
|
|
|
)
|
|
|
|
assert expected == message.text_markdown
|
2017-05-21 14:00:07 +02:00
|
|
|
|
2022-08-25 19:36:55 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"type_",
|
|
|
|
argvalues=[
|
|
|
|
"text_html",
|
|
|
|
"text_html_urled",
|
|
|
|
"text_markdown",
|
|
|
|
"text_markdown_urled",
|
|
|
|
"text_markdown_v2",
|
|
|
|
"text_markdown_v2_urled",
|
|
|
|
],
|
|
|
|
)
|
|
|
|
def test_text_custom_emoji(self, type_):
|
|
|
|
text = "Look a custom emoji: 😎"
|
|
|
|
expected = "Look a custom emoji: 😎"
|
|
|
|
emoji_entity = MessageEntity(
|
|
|
|
type=MessageEntity.CUSTOM_EMOJI,
|
|
|
|
offset=21,
|
|
|
|
length=2,
|
|
|
|
custom_emoji_id="5472409228461217725",
|
|
|
|
)
|
|
|
|
message = Message(
|
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
text=text,
|
|
|
|
entities=[emoji_entity],
|
|
|
|
)
|
|
|
|
assert expected == message[type_]
|
|
|
|
|
2018-02-22 16:38:54 +01:00
|
|
|
def test_caption_html_simple(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_html_string = (
|
|
|
|
"<u>Test</u> for <<b>bold</b>, <i>ita_lic</i>, "
|
|
|
|
r"<code>\`code</code>, "
|
|
|
|
r'<a href="http://github.com/abc\)def">links</a>, '
|
2018-09-25 20:07:55 +02:00
|
|
|
'<a href="tg://user?id=123456789">text-mention</a> and '
|
2020-06-15 18:20:51 +02:00
|
|
|
r"<pre>`\pre</pre>. http://google.com "
|
2021-01-12 19:33:26 +01:00
|
|
|
"and <i>bold <b>nested in <s>strk>trgh</s> nested in</b> italic</i>. "
|
2022-01-03 08:13:33 +01:00
|
|
|
'<pre><code class="python">Python pre</code></pre>. '
|
|
|
|
'<span class="tg-spoiler">Spoiled</span>.'
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
caption_html = self.test_message_v2.caption_html
|
2018-02-22 16:38:54 +01:00
|
|
|
assert caption_html == test_html_string
|
|
|
|
|
2018-03-16 21:42:39 +01:00
|
|
|
def test_caption_html_empty(self, message):
|
|
|
|
message.text = "test"
|
|
|
|
message.caption = None
|
|
|
|
assert message.caption_html is None
|
|
|
|
|
2018-02-22 16:38:54 +01:00
|
|
|
def test_caption_html_urled(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_html_string = (
|
|
|
|
"<u>Test</u> for <<b>bold</b>, <i>ita_lic</i>, "
|
|
|
|
r"<code>\`code</code>, "
|
|
|
|
r'<a href="http://github.com/abc\)def">links</a>, '
|
2018-09-25 20:07:55 +02:00
|
|
|
'<a href="tg://user?id=123456789">text-mention</a> and '
|
2020-06-15 18:20:51 +02:00
|
|
|
r'<pre>`\pre</pre>. <a href="http://google.com">http://google.com</a> '
|
2021-01-12 19:33:26 +01:00
|
|
|
"and <i>bold <b>nested in <s>strk>trgh</s> nested in</b> italic</i>. "
|
2022-01-03 08:13:33 +01:00
|
|
|
'<pre><code class="python">Python pre</code></pre>. '
|
|
|
|
'<span class="tg-spoiler">Spoiled</span>.'
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
caption_html = self.test_message_v2.caption_html_urled
|
2018-02-22 16:38:54 +01:00
|
|
|
assert caption_html == test_html_string
|
|
|
|
|
|
|
|
def test_caption_markdown_simple(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_md_string = (
|
|
|
|
r"Test for <*bold*, _ita_\__lic_, `code`, "
|
|
|
|
"[links](http://github.com/ab_), "
|
|
|
|
"[text-mention](tg://user?id=123456789) and ```python\npre```. "
|
|
|
|
r"http://google.com/ab\_"
|
|
|
|
)
|
2018-02-22 16:38:54 +01:00
|
|
|
caption_markdown = self.test_message.caption_markdown
|
|
|
|
assert caption_markdown == test_md_string
|
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
def test_caption_markdown_v2_simple(self):
|
|
|
|
test_md_string = (
|
|
|
|
r"__Test__ for <*bold*, _ita\_lic_, `\\\`code`, "
|
|
|
|
"[links](http://github.com/abc\\\\\\)def), "
|
2020-06-15 18:20:51 +02:00
|
|
|
"[text\\-mention](tg://user?id=123456789) and ```\\`\\\\pre```\\. "
|
2021-01-12 19:33:26 +01:00
|
|
|
r"http://google\.com and _bold *nested in ~strk\>trgh~ nested in* italic_\. "
|
2022-01-03 08:13:33 +01:00
|
|
|
"```python\nPython pre```\\. ||Spoiled||\\."
|
2020-06-15 18:20:51 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
caption_markdown = self.test_message_v2.caption_markdown_v2
|
|
|
|
assert caption_markdown == test_md_string
|
|
|
|
|
2018-03-16 21:42:39 +01:00
|
|
|
def test_caption_markdown_empty(self, message):
|
|
|
|
message.text = "test"
|
|
|
|
message.caption = None
|
|
|
|
assert message.caption_markdown is None
|
2020-03-28 16:37:26 +01:00
|
|
|
assert message.caption_markdown_v2 is None
|
2018-03-16 21:42:39 +01:00
|
|
|
|
2018-02-22 16:38:54 +01:00
|
|
|
def test_caption_markdown_urled(self):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_md_string = (
|
|
|
|
r"Test for <*bold*, _ita_\__lic_, `code`, "
|
|
|
|
"[links](http://github.com/ab_), "
|
|
|
|
"[text-mention](tg://user?id=123456789) and ```python\npre```. "
|
2020-03-28 16:37:26 +01:00
|
|
|
"[http://google.com/ab_](http://google.com/ab_)"
|
|
|
|
)
|
2018-02-22 16:38:54 +01:00
|
|
|
caption_markdown = self.test_message.caption_markdown_urled
|
|
|
|
assert caption_markdown == test_md_string
|
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
def test_caption_markdown_v2_urled(self):
|
|
|
|
test_md_string = (
|
|
|
|
r"__Test__ for <*bold*, _ita\_lic_, `\\\`code`, "
|
|
|
|
"[links](http://github.com/abc\\\\\\)def), "
|
2020-06-15 18:20:51 +02:00
|
|
|
"[text\\-mention](tg://user?id=123456789) and ```\\`\\\\pre```\\. "
|
2021-01-12 19:33:26 +01:00
|
|
|
r"[http://google\.com](http://google.com) and _bold *nested in ~strk\>trgh~ "
|
2022-01-03 08:13:33 +01:00
|
|
|
"nested in* italic_\\. ```python\nPython pre```\\. ||Spoiled||\\."
|
2020-06-15 18:20:51 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
caption_markdown = self.test_message_v2.caption_markdown_v2_urled
|
|
|
|
assert caption_markdown == test_md_string
|
|
|
|
|
2018-02-22 16:38:54 +01:00
|
|
|
def test_caption_html_emoji(self):
|
|
|
|
caption = b"\\U0001f469\\u200d\\U0001f469\\u200d ABC".decode("unicode-escape")
|
|
|
|
expected = b"\\U0001f469\\u200d\\U0001f469\\u200d <b>ABC</b>".decode("unicode-escape")
|
|
|
|
bold_entity = MessageEntity(type=MessageEntity.BOLD, offset=7, length=3)
|
|
|
|
message = Message(
|
|
|
|
1,
|
2022-05-18 17:18:44 +02:00
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
2018-02-22 16:38:54 +01:00
|
|
|
caption=caption,
|
|
|
|
caption_entities=[bold_entity],
|
|
|
|
)
|
|
|
|
assert expected == message.caption_html
|
|
|
|
|
|
|
|
def test_caption_markdown_emoji(self):
|
|
|
|
caption = b"\\U0001f469\\u200d\\U0001f469\\u200d ABC".decode("unicode-escape")
|
|
|
|
expected = b"\\U0001f469\\u200d\\U0001f469\\u200d *ABC*".decode("unicode-escape")
|
|
|
|
bold_entity = MessageEntity(type=MessageEntity.BOLD, offset=7, length=3)
|
|
|
|
message = Message(
|
|
|
|
1,
|
2022-05-18 17:18:44 +02:00
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
2018-02-22 16:38:54 +01:00
|
|
|
caption=caption,
|
|
|
|
caption_entities=[bold_entity],
|
|
|
|
)
|
|
|
|
assert expected == message.caption_markdown
|
|
|
|
|
2022-08-25 19:36:55 +02:00
|
|
|
@pytest.mark.parametrize(
|
|
|
|
"type_",
|
|
|
|
argvalues=[
|
|
|
|
"caption_html",
|
|
|
|
"caption_html_urled",
|
|
|
|
"caption_markdown",
|
|
|
|
"caption_markdown_urled",
|
|
|
|
"caption_markdown_v2",
|
|
|
|
"caption_markdown_v2_urled",
|
|
|
|
],
|
|
|
|
)
|
|
|
|
def test_caption_custom_emoji(self, type_):
|
|
|
|
caption = "Look a custom emoji: 😎"
|
|
|
|
expected = "Look a custom emoji: 😎"
|
|
|
|
emoji_entity = MessageEntity(
|
|
|
|
type=MessageEntity.CUSTOM_EMOJI,
|
|
|
|
offset=21,
|
|
|
|
length=2,
|
|
|
|
custom_emoji_id="5472409228461217725",
|
|
|
|
)
|
|
|
|
message = Message(
|
|
|
|
1,
|
|
|
|
from_user=self.from_user,
|
|
|
|
date=self.date,
|
|
|
|
chat=self.chat,
|
|
|
|
caption=caption,
|
|
|
|
caption_entities=[emoji_entity],
|
|
|
|
)
|
|
|
|
assert expected == message[type_]
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_parse_entities_url_emoji(self):
|
2017-05-21 14:00:07 +02:00
|
|
|
url = b"http://github.com/?unicode=\\u2713\\U0001f469".decode("unicode-escape")
|
|
|
|
text = "some url"
|
2017-08-11 23:58:41 +02:00
|
|
|
link_entity = MessageEntity(type=MessageEntity.URL, offset=0, length=8, url=url)
|
|
|
|
message = Message(
|
|
|
|
1, self.from_user, self.date, self.chat, text=text, entities=[link_entity]
|
|
|
|
)
|
|
|
|
assert message.parse_entities() == {link_entity: text}
|
|
|
|
assert next(iter(message.parse_entities())).url == url
|
2017-05-14 23:29:31 +02:00
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
def test_chat_id(self, message):
|
|
|
|
assert message.chat_id == message.chat.id
|
2017-05-14 23:29:31 +02:00
|
|
|
|
2022-06-01 21:29:46 +02:00
|
|
|
def test_id(self, message):
|
|
|
|
assert message.message_id == message.id
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
@pytest.mark.parametrize("type_", argvalues=[Chat.SUPERGROUP, Chat.CHANNEL])
|
|
|
|
def test_link_with_username(self, message, type_):
|
2018-05-09 11:42:12 +02:00
|
|
|
message.chat.username = "username"
|
2022-04-24 12:38:09 +02:00
|
|
|
message.chat.type = type_
|
2020-11-23 22:09:29 +01:00
|
|
|
assert message.link == f"https://t.me/{message.chat.username}/{message.message_id}"
|
2019-11-29 13:50:44 +01:00
|
|
|
|
|
|
|
@pytest.mark.parametrize(
|
2022-04-24 12:38:09 +02:00
|
|
|
"type_, id_", argvalues=[(Chat.CHANNEL, -1003), (Chat.SUPERGROUP, -1003)]
|
2020-02-02 20:27:53 +01:00
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
def test_link_with_id(self, message, type_, id_):
|
2019-11-29 13:50:44 +01:00
|
|
|
message.chat.username = None
|
2022-04-24 12:38:09 +02:00
|
|
|
message.chat.id = id_
|
|
|
|
message.chat.type = type_
|
2019-11-29 13:50:44 +01:00
|
|
|
# The leading - for group ids/ -100 for supergroup ids isn't supposed to be in the link
|
2020-11-23 22:09:29 +01:00
|
|
|
assert message.link == f"https://t.me/c/{3}/{message.message_id}"
|
2019-11-29 13:50:44 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
@pytest.mark.parametrize("id_, username", argvalues=[(None, "username"), (-3, None)])
|
|
|
|
def test_link_private_chats(self, message, id_, username):
|
2019-11-29 13:50:44 +01:00
|
|
|
message.chat.type = Chat.PRIVATE
|
2022-04-24 12:38:09 +02:00
|
|
|
message.chat.id = id_
|
2019-11-29 13:50:44 +01:00
|
|
|
message.chat.username = username
|
2018-05-09 11:42:12 +02:00
|
|
|
assert message.link is None
|
2020-02-02 20:27:53 +01:00
|
|
|
message.chat.type = Chat.GROUP
|
|
|
|
assert message.link is None
|
2018-05-09 11:42:12 +02:00
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
def test_effective_attachment(self, message_params):
|
2021-10-19 18:28:19 +02:00
|
|
|
# This list is hard coded on purpose because just using constants.MessageAttachmentType
|
|
|
|
# (which is used in Message.effective_message) wouldn't find any mistakes
|
|
|
|
expected_attachment_types = [
|
|
|
|
"animation",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"audio",
|
2021-10-19 18:28:19 +02:00
|
|
|
"contact",
|
|
|
|
"dice",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"document",
|
2021-10-19 18:28:19 +02:00
|
|
|
"game",
|
|
|
|
"invoice",
|
|
|
|
"location",
|
|
|
|
"passport_data",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"photo",
|
2021-10-19 18:28:19 +02:00
|
|
|
"poll",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"sticker",
|
2021-10-19 18:28:19 +02:00
|
|
|
"successful_payment",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"video",
|
|
|
|
"video_note",
|
2021-10-19 18:28:19 +02:00
|
|
|
"voice",
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
"venue",
|
2021-10-19 18:28:19 +02:00
|
|
|
]
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
for _ in range(3):
|
|
|
|
# We run the same test multiple times to make sure that the caching is tested
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
attachment = message_params.effective_attachment
|
|
|
|
if attachment:
|
|
|
|
condition = any(
|
|
|
|
message_params[message_type] is attachment
|
|
|
|
for message_type in expected_attachment_types
|
|
|
|
)
|
|
|
|
assert condition, "Got effective_attachment for unexpected type"
|
|
|
|
else:
|
|
|
|
condition = any(
|
|
|
|
message_params[message_type] for message_type in expected_attachment_types
|
|
|
|
)
|
|
|
|
assert not condition, "effective_attachment was None even though it should not be"
|
|
|
|
|
|
|
|
async def test_reply_text(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
|
|
|
text = kwargs["text"] == "test"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and text and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_text, Bot.send_message, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_text, message.get_bot(), "send_message")
|
|
|
|
assert await check_defaults_handling(message.reply_text, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_text("test")
|
|
|
|
assert await message.reply_text("test", quote=True)
|
|
|
|
assert await message.reply_text("test", reply_to_message_id=message.message_id, quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_markdown(self, monkeypatch, message):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_md_string = (
|
|
|
|
r"Test for <*bold*, _ita_\__lic_, `code`, "
|
|
|
|
"[links](http://github.com/ab_), "
|
|
|
|
"[text-mention](tg://user?id=123456789) and ```python\npre```. "
|
|
|
|
r"http://google.com/ab\_"
|
|
|
|
)
|
2018-02-12 14:39:46 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
cid = kwargs["chat_id"] == message.chat_id
|
|
|
|
markdown_text = kwargs["text"] == test_md_string
|
2018-02-12 14:39:46 +01:00
|
|
|
markdown_enabled = kwargs["parse_mode"] == ParseMode.MARKDOWN
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2018-02-12 14:39:46 +01:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return all([cid, markdown_text, reply, markdown_enabled])
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_markdown, Bot.send_message, ["chat_id", "parse_mode"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_text, message.get_bot(), "send_message")
|
|
|
|
assert await check_defaults_handling(message.reply_text, message.get_bot())
|
2018-02-12 14:39:46 +01:00
|
|
|
|
|
|
|
text_markdown = self.test_message.text_markdown
|
|
|
|
assert text_markdown == test_md_string
|
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_markdown(self.test_message.text_markdown)
|
|
|
|
assert await message.reply_markdown(self.test_message.text_markdown, quote=True)
|
|
|
|
assert await message.reply_markdown(
|
2018-02-12 14:39:46 +01:00
|
|
|
self.test_message.text_markdown, reply_to_message_id=message.message_id, quote=True
|
|
|
|
)
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_markdown_v2(self, monkeypatch, message):
|
2020-03-28 16:37:26 +01:00
|
|
|
test_md_string = (
|
|
|
|
r"__Test__ for <*bold*, _ita\_lic_, `\\\`code`, "
|
2020-06-15 18:20:51 +02:00
|
|
|
"[links](http://github.com/abc\\\\\\)def), "
|
|
|
|
"[text\\-mention](tg://user?id=123456789) and ```\\`\\\\pre```\\. "
|
2021-01-12 19:33:26 +01:00
|
|
|
r"http://google\.com and _bold *nested in ~strk\>trgh~ nested in* italic_\. "
|
2022-01-03 08:13:33 +01:00
|
|
|
"```python\nPython pre```\\. ||Spoiled||\\."
|
2020-06-15 18:20:51 +02:00
|
|
|
)
|
2020-03-28 16:37:26 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
cid = kwargs["chat_id"] == message.chat_id
|
|
|
|
markdown_text = kwargs["text"] == test_md_string
|
2020-03-28 16:37:26 +01:00
|
|
|
markdown_enabled = kwargs["parse_mode"] == ParseMode.MARKDOWN_V2
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2020-03-28 16:37:26 +01:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return all([cid, markdown_text, reply, markdown_enabled])
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_markdown_v2, Bot.send_message, ["chat_id", "parse_mode"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_text, message.get_bot(), "send_message")
|
|
|
|
assert await check_defaults_handling(message.reply_text, message.get_bot())
|
2020-03-28 16:37:26 +01:00
|
|
|
|
|
|
|
text_markdown = self.test_message_v2.text_markdown_v2
|
|
|
|
assert text_markdown == test_md_string
|
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_markdown_v2(self.test_message_v2.text_markdown_v2)
|
|
|
|
assert await message.reply_markdown_v2(self.test_message_v2.text_markdown_v2, quote=True)
|
|
|
|
assert await message.reply_markdown_v2(
|
2020-03-28 16:37:26 +01:00
|
|
|
self.test_message_v2.text_markdown_v2,
|
|
|
|
reply_to_message_id=message.message_id,
|
|
|
|
quote=True,
|
|
|
|
)
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_html(self, monkeypatch, message):
|
2020-06-15 18:20:51 +02:00
|
|
|
test_html_string = (
|
|
|
|
"<u>Test</u> for <<b>bold</b>, <i>ita_lic</i>, "
|
|
|
|
r"<code>\`code</code>, "
|
|
|
|
r'<a href="http://github.com/abc\)def">links</a>, '
|
2018-09-25 20:07:55 +02:00
|
|
|
'<a href="tg://user?id=123456789">text-mention</a> and '
|
2020-06-15 18:20:51 +02:00
|
|
|
r"<pre>`\pre</pre>. http://google.com "
|
2021-01-12 19:33:26 +01:00
|
|
|
"and <i>bold <b>nested in <s>strk>trgh</s> nested in</b> italic</i>. "
|
2022-01-03 08:13:33 +01:00
|
|
|
'<pre><code class="python">Python pre</code></pre>. '
|
|
|
|
'<span class="tg-spoiler">Spoiled</span>.'
|
2020-03-29 09:52:30 +02:00
|
|
|
)
|
2018-02-12 14:39:46 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
cid = kwargs["chat_id"] == message.chat_id
|
|
|
|
html_text = kwargs["text"] == test_html_string
|
2018-02-12 14:39:46 +01:00
|
|
|
html_enabled = kwargs["parse_mode"] == ParseMode.HTML
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2018-02-12 14:39:46 +01:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return all([cid, html_text, reply, html_enabled])
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_html, Bot.send_message, ["chat_id", "parse_mode"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_text, message.get_bot(), "send_message")
|
|
|
|
assert await check_defaults_handling(message.reply_text, message.get_bot())
|
2018-02-12 14:39:46 +01:00
|
|
|
|
2020-03-28 16:37:26 +01:00
|
|
|
text_html = self.test_message_v2.text_html
|
2018-02-12 14:39:46 +01:00
|
|
|
assert text_html == test_html_string
|
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_html(self.test_message_v2.text_html)
|
|
|
|
assert await message.reply_html(self.test_message_v2.text_html, quote=True)
|
|
|
|
assert await message.reply_html(
|
2020-03-28 16:37:26 +01:00
|
|
|
self.test_message_v2.text_html, reply_to_message_id=message.message_id, quote=True
|
2018-02-12 14:39:46 +01:00
|
|
|
)
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_media_group(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2018-02-12 14:51:18 +01:00
|
|
|
media = kwargs["media"] == "reply_media_group"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2018-02-12 14:51:18 +01:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and media and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_media_group, Bot.send_media_group, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-10-21 11:17:12 +02:00
|
|
|
message.reply_media_group, message.get_bot(), "send_media_group"
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.reply_media_group, message.get_bot())
|
2018-02-12 14:51:18 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_media_group", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_media_group(media="reply_media_group")
|
|
|
|
assert await message.reply_media_group(media="reply_media_group", quote=True)
|
2018-02-12 14:51:18 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_photo(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
photo = kwargs["photo"] == "test_photo"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and photo and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_photo, Bot.send_photo, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_photo, message.get_bot(), "send_photo")
|
|
|
|
assert await check_defaults_handling(message.reply_photo, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_photo", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_photo(photo="test_photo")
|
|
|
|
assert await message.reply_photo(photo="test_photo", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_audio(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
audio = kwargs["audio"] == "test_audio"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and audio and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_audio, Bot.send_audio, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_audio, message.get_bot(), "send_audio")
|
|
|
|
assert await check_defaults_handling(message.reply_audio, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_audio", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_audio(audio="test_audio")
|
|
|
|
assert await message.reply_audio(audio="test_audio", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_document(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
document = kwargs["document"] == "test_document"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and document and reply
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_document, Bot.send_document, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.reply_document, message.get_bot(), "send_document"
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.reply_document, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_document", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_document(document="test_document")
|
|
|
|
assert await message.reply_document(document="test_document", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_animation(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
animation = kwargs["animation"] == "test_animation"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and animation and reply
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_animation, Bot.send_animation, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.reply_animation, message.get_bot(), "send_animation"
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.reply_animation, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_animation", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_animation(animation="test_animation")
|
|
|
|
assert await message.reply_animation(animation="test_animation", quote=True)
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_sticker(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
sticker = kwargs["sticker"] == "test_sticker"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and sticker and reply
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_sticker, Bot.send_sticker, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_sticker, message.get_bot(), "send_sticker")
|
|
|
|
assert await check_defaults_handling(message.reply_sticker, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_sticker", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_sticker(sticker="test_sticker")
|
|
|
|
assert await message.reply_sticker(sticker="test_sticker", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_video(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
video = kwargs["video"] == "test_video"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and video and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_video, Bot.send_video, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_video, message.get_bot(), "send_video")
|
|
|
|
assert await check_defaults_handling(message.reply_video, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_video", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_video(video="test_video")
|
|
|
|
assert await message.reply_video(video="test_video", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_video_note(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
video_note = kwargs["video_note"] == "test_video_note"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and video_note and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_video_note, Bot.send_video_note, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.reply_video_note, message.get_bot(), "send_video_note"
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.reply_video_note, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_video_note", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_video_note(video_note="test_video_note")
|
|
|
|
assert await message.reply_video_note(video_note="test_video_note", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_voice(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
voice = kwargs["voice"] == "test_voice"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and voice and reply
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_voice, Bot.send_voice, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_voice, message.get_bot(), "send_voice")
|
|
|
|
assert await check_defaults_handling(message.reply_voice, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_voice", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_voice(voice="test_voice")
|
|
|
|
assert await message.reply_voice(voice="test_voice", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_location(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
location = kwargs["location"] == "test_location"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and location and reply
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_location, Bot.send_location, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.reply_location, message.get_bot(), "send_location"
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.reply_location, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_location", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_location(location="test_location")
|
|
|
|
assert await message.reply_location(location="test_location", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_venue(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
venue = kwargs["venue"] == "test_venue"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and venue and reply
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_venue, Bot.send_venue, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_venue, message.get_bot(), "send_venue")
|
|
|
|
assert await check_defaults_handling(message.reply_venue, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_venue", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_venue(venue="test_venue")
|
|
|
|
assert await message.reply_venue(venue="test_venue", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_contact(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2017-08-11 23:58:41 +02:00
|
|
|
contact = kwargs["contact"] == "test_contact"
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2017-08-11 23:58:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and contact and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_contact, Bot.send_contact, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_contact, message.get_bot(), "send_contact")
|
|
|
|
assert await check_defaults_handling(message.reply_contact, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_contact", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_contact(contact="test_contact")
|
|
|
|
assert await message.reply_contact(contact="test_contact", quote=True)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_poll(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
|
|
|
question = kwargs["question"] == "test_poll"
|
|
|
|
options = kwargs["options"] == ["1", "2", "3"]
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2019-08-23 21:20:41 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and question and options and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(Message.reply_poll, Bot.send_poll, ["chat_id"], ["quote"])
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_poll, message.get_bot(), "send_poll")
|
|
|
|
assert await check_defaults_handling(message.reply_poll, message.get_bot())
|
2019-08-23 21:20:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_poll", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_poll(question="test_poll", options=["1", "2", "3"])
|
|
|
|
assert await message.reply_poll(question="test_poll", quote=True, options=["1", "2", "3"])
|
2020-04-10 19:22:45 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_dice(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-12-30 13:41:07 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
2020-04-10 19:22:45 +02:00
|
|
|
contact = kwargs["disable_notification"] is True
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
2020-04-10 19:22:45 +02:00
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and contact and reply
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(Message.reply_dice, Bot.send_dice, ["chat_id"], ["quote"])
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_dice, message.get_bot(), "send_dice")
|
|
|
|
assert await check_defaults_handling(message.reply_dice, message.get_bot())
|
2020-04-10 19:22:45 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_dice", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_dice(disable_notification=True)
|
|
|
|
assert await message.reply_dice(disable_notification=True, quote=True)
|
2019-08-23 21:20:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_action(self, monkeypatch, message: Message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2021-01-23 13:40:19 +01:00
|
|
|
id_ = kwargs["chat_id"] == message.chat_id
|
|
|
|
action = kwargs["action"] == ChatAction.TYPING
|
2021-02-19 19:07:48 +01:00
|
|
|
return id_ and action
|
2021-01-23 13:40:19 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_chat_action, Bot.send_chat_action, ["chat_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-10-21 11:17:12 +02:00
|
|
|
message.reply_chat_action, message.get_bot(), "send_chat_action"
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.reply_chat_action, message.get_bot())
|
2021-01-23 13:40:19 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_chat_action", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_chat_action(action=ChatAction.TYPING)
|
2021-01-23 13:40:19 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_game(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2021-01-23 13:40:19 +01:00
|
|
|
return (
|
2021-02-19 19:07:48 +01:00
|
|
|
kwargs["chat_id"] == message.chat_id and kwargs["game_short_name"] == "test_game"
|
2021-01-23 13:40:19 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(Message.reply_game, Bot.send_game, ["chat_id"], ["quote"])
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_game, message.get_bot(), "send_game")
|
|
|
|
assert await check_defaults_handling(message.reply_game, message.get_bot())
|
2021-01-23 13:40:19 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_game", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_game(game_short_name="test_game")
|
|
|
|
assert await message.reply_game(game_short_name="test_game", quote=True)
|
2021-01-23 13:40:19 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_invoice(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2021-01-23 13:40:19 +01:00
|
|
|
title = kwargs["title"] == "title"
|
|
|
|
description = kwargs["description"] == "description"
|
|
|
|
payload = kwargs["payload"] == "payload"
|
|
|
|
provider_token = kwargs["provider_token"] == "provider_token"
|
|
|
|
currency = kwargs["currency"] == "currency"
|
|
|
|
prices = kwargs["prices"] == "prices"
|
2021-04-30 10:09:21 +02:00
|
|
|
args = title and description and payload and provider_token and currency and prices
|
2021-02-19 19:07:48 +01:00
|
|
|
return kwargs["chat_id"] == message.chat_id and args
|
2021-01-23 13:40:19 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_invoice, Bot.send_invoice, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.reply_invoice, message.get_bot(), "send_invoice")
|
|
|
|
assert await check_defaults_handling(message.reply_invoice, message.get_bot())
|
2021-01-23 13:40:19 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "send_invoice", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_invoice(
|
2021-01-23 13:40:19 +01:00
|
|
|
"title",
|
|
|
|
"description",
|
|
|
|
"payload",
|
|
|
|
"provider_token",
|
|
|
|
"currency",
|
|
|
|
"prices",
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_invoice(
|
2021-01-23 13:40:19 +01:00
|
|
|
"title",
|
|
|
|
"description",
|
|
|
|
"payload",
|
|
|
|
"provider_token",
|
|
|
|
"currency",
|
|
|
|
"prices",
|
|
|
|
quote=True,
|
|
|
|
)
|
|
|
|
|
2022-01-03 08:13:33 +01:00
|
|
|
@pytest.mark.parametrize("disable_notification,protected", [(False, True), (True, False)])
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_forward(self, monkeypatch, message, disable_notification, protected):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2017-08-11 23:58:41 +02:00
|
|
|
chat_id = kwargs["chat_id"] == 123456
|
|
|
|
from_chat = kwargs["from_chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2020-12-30 13:41:07 +01:00
|
|
|
notification = kwargs["disable_notification"] == disable_notification
|
2022-01-03 08:13:33 +01:00
|
|
|
protected_cont = kwargs["protect_content"] == protected
|
|
|
|
return chat_id and from_chat and message_id and notification and protected_cont
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.forward, Bot.forward_message, ["from_chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.forward, message.get_bot(), "forward_message")
|
|
|
|
assert await check_defaults_handling(message.forward, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "forward_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.forward(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456, disable_notification=disable_notification, protect_content=protected
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert not await message.forward(635241)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-01-03 08:13:33 +01:00
|
|
|
@pytest.mark.parametrize("disable_notification,protected", [(True, False), (False, True)])
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_copy(self, monkeypatch, message, disable_notification, protected):
|
2020-11-29 16:20:46 +01:00
|
|
|
keyboard = [[1, 2]]
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-11-29 16:20:46 +01:00
|
|
|
chat_id = kwargs["chat_id"] == 123456
|
|
|
|
from_chat = kwargs["from_chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2020-12-30 13:41:07 +01:00
|
|
|
notification = kwargs["disable_notification"] == disable_notification
|
2022-01-03 08:13:33 +01:00
|
|
|
protected_cont = kwargs["protect_content"] == protected
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_markup") is not None:
|
2020-11-29 16:20:46 +01:00
|
|
|
reply_markup = kwargs["reply_markup"] is keyboard
|
|
|
|
else:
|
|
|
|
reply_markup = True
|
2022-01-03 08:13:33 +01:00
|
|
|
return (
|
|
|
|
chat_id
|
|
|
|
and from_chat
|
|
|
|
and message_id
|
|
|
|
and notification
|
|
|
|
and reply_markup
|
|
|
|
and protected_cont
|
|
|
|
)
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.copy, Bot.copy_message, ["from_chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.copy, message.get_bot(), "copy_message")
|
|
|
|
assert await check_defaults_handling(message.copy, message.get_bot())
|
2021-10-21 11:17:12 +02:00
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "copy_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.copy(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456, disable_notification=disable_notification, protect_content=protected
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.copy(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456,
|
|
|
|
reply_markup=keyboard,
|
|
|
|
disable_notification=disable_notification,
|
|
|
|
protect_content=protected,
|
2020-12-30 13:41:07 +01:00
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert not await message.copy(635241)
|
2020-11-29 16:20:46 +01:00
|
|
|
|
2022-01-03 08:13:33 +01:00
|
|
|
@pytest.mark.parametrize("disable_notification,protected", [(True, False), (False, True)])
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_reply_copy(self, monkeypatch, message, disable_notification, protected):
|
2020-11-29 16:20:46 +01:00
|
|
|
keyboard = [[1, 2]]
|
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-11-29 16:20:46 +01:00
|
|
|
chat_id = kwargs["from_chat_id"] == 123456
|
|
|
|
from_chat = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == 456789
|
2020-12-30 13:41:07 +01:00
|
|
|
notification = kwargs["disable_notification"] == disable_notification
|
2022-01-03 08:13:33 +01:00
|
|
|
is_protected = kwargs["protect_content"] == protected
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_markup") is not None:
|
2020-11-29 16:20:46 +01:00
|
|
|
reply_markup = kwargs["reply_markup"] is keyboard
|
|
|
|
else:
|
|
|
|
reply_markup = True
|
2020-12-03 20:51:47 +01:00
|
|
|
if kwargs.get("reply_to_message_id") is not None:
|
|
|
|
reply = kwargs["reply_to_message_id"] == message.message_id
|
|
|
|
else:
|
|
|
|
reply = True
|
2022-01-03 08:13:33 +01:00
|
|
|
return (
|
|
|
|
chat_id
|
|
|
|
and from_chat
|
|
|
|
and message_id
|
|
|
|
and notification
|
|
|
|
and reply_markup
|
|
|
|
and reply
|
|
|
|
and is_protected
|
|
|
|
)
|
2020-11-29 16:20:46 +01:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reply_copy, Bot.copy_message, ["chat_id"], ["quote"]
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.copy, message.get_bot(), "copy_message")
|
|
|
|
assert await check_defaults_handling(message.copy, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "copy_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_copy(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456, 456789, disable_notification=disable_notification, protect_content=protected
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_copy(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456,
|
|
|
|
456789,
|
|
|
|
reply_markup=keyboard,
|
|
|
|
disable_notification=disable_notification,
|
|
|
|
protect_content=protected,
|
2020-12-30 13:41:07 +01:00
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_copy(
|
2022-01-03 08:13:33 +01:00
|
|
|
123456,
|
|
|
|
456789,
|
|
|
|
quote=True,
|
|
|
|
disable_notification=disable_notification,
|
|
|
|
protect_content=protected,
|
2020-12-30 13:41:07 +01:00
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.reply_copy(
|
2020-12-30 13:41:07 +01:00
|
|
|
123456,
|
|
|
|
456789,
|
|
|
|
quote=True,
|
|
|
|
reply_to_message_id=message.message_id,
|
|
|
|
disable_notification=disable_notification,
|
2022-01-03 08:13:33 +01:00
|
|
|
protect_content=protected,
|
2020-12-03 20:51:47 +01:00
|
|
|
)
|
2020-11-29 16:20:46 +01:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_edit_text(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2017-08-11 23:58:41 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
text = kwargs["text"] == "test"
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and text
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_text,
|
|
|
|
Bot.edit_message_text,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.edit_text,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"edit_message_text",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.edit_text, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_message_text", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.edit_text(text="test")
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_edit_caption(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2017-08-11 23:58:41 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
caption = kwargs["caption"] == "new caption"
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and caption
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_caption,
|
|
|
|
Bot.edit_message_caption,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.edit_caption,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"edit_message_caption",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.edit_caption, message.get_bot())
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_message_caption", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.edit_caption(caption="new caption")
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_edit_media(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
media = kwargs["media"] == "my_media"
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and media
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_media,
|
|
|
|
Bot.edit_message_media,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.edit_media,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"edit_message_media",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.edit_media, message.get_bot())
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_message_media", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.edit_media("my_media")
|
Bot API 4.0 (#1168)
Telegram Passport (#1174):
- Add full support for telegram passport.
- New types: PassportData, PassportFile, EncryptedPassportElement, EncryptedCredentials, PassportElementError, PassportElementErrorDataField, PassportElementErrorFrontSide, PassportElementErrorReverseSide, PassportElementErrorSelfie, PassportElementErrorFile and PassportElementErrorFiles.
- New bot method: set_passport_data_errors
- New filter: Filters.passport_data
- Field passport_data field on Message
- PassportData is automagically decrypted when you specify your private key when creating Updater or Bot.
- PassportFiles is also automagically decrypted as you download/retrieve them.
- See new passportbot.py example for details on how to use, or go to our telegram passport wiki page for more info
- NOTE: Passport decryption requires new dependency `cryptography`.
Inputfile rework (#1184):
- Change how Inputfile is handled internally
- This allows support for specifying the thumbnails of photos and videos using the thumb= argument in the different send_ methods.
- Also allows Bot.send_media_group to actually finally send more than one media.
- Add thumb to Audio, Video and Videonote
- Add Bot.edit_message_media together with InputMediaAnimation, InputMediaAudio, and inputMediaDocument.
Other Bot API 4.0 changes:
- Add forusquare_type to Venue, InlineQueryResultVenue, InputVenueMessageContent, and Bot.send_venue. (#1170)
- Add vCard support by adding vcard field to Contact, InlineQueryResultContact, InputContactMessageContent, and Bot.send_contact. (#1166)
- Support new message entities: CASHTAG and PHONE_NUMBER. (#1179)
- Cashtag seems to be things like $USD and $GBP, but it seems telegram doesn't currently send them to bots.
- Phone number also seems to have limited support for now
- Add Bot.send_animation, add width, height, and duration to Animation, and add Filters.animation. (#1172)
Co-authored-by: Jasmin Bom <jsmnbom@gmail.com>
Co-authored-by: code1mountain <32801117+code1mountain@users.noreply.github.com>
Co-authored-by: Eldinnie <pieter.schutz+github@gmail.com>
Co-authored-by: mathefreak1 <mathefreak@hi2.in>
2018-08-29 14:18:58 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_edit_reply_markup(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2017-08-11 23:58:41 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
reply_markup = kwargs["reply_markup"] == [["1", "2"]]
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and reply_markup
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_reply_markup,
|
|
|
|
Bot.edit_message_reply_markup,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.edit_reply_markup,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"edit_message_reply_markup",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.edit_reply_markup, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_message_reply_markup", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.edit_reply_markup(reply_markup=[["1", "2"]])
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_edit_live_location(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
latitude = kwargs["latitude"] == 1
|
|
|
|
longitude = kwargs["longitude"] == 2
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and longitude and latitude
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_live_location,
|
|
|
|
Bot.edit_message_live_location,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.edit_live_location,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"edit_message_live_location",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.edit_live_location, message.get_bot())
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_message_live_location", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.edit_live_location(latitude=1, longitude=2)
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_stop_live_location(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.stop_live_location,
|
|
|
|
Bot.stop_message_live_location,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.stop_live_location,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"stop_message_live_location",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.stop_live_location, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "stop_message_live_location", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.stop_live_location()
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_set_game_score(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
user_id = kwargs["user_id"] == 1
|
|
|
|
score = kwargs["score"] == 2
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and user_id and score
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.set_game_score,
|
|
|
|
Bot.set_game_score,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.set_game_score,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"set_game_score",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.set_game_score, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "set_game_score", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.set_game_score(user_id=1, score=2)
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_get_game_high_scores(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
|
|
|
user_id = kwargs["user_id"] == 1
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id and user_id
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.get_game_high_scores,
|
|
|
|
Bot.get_game_high_scores,
|
|
|
|
["chat_id", "message_id", "inline_message_id"],
|
|
|
|
[],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.get_game_high_scores,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"get_game_high_scores",
|
|
|
|
skip_params=["inline_message_id"],
|
|
|
|
shortcut_kwargs=["message_id", "chat_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.get_game_high_scores, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "get_game_high_scores", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.get_game_high_scores(user_id=1)
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_delete(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2017-08-11 23:58:41 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2020-12-30 13:41:07 +01:00
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.delete, Bot.delete_message, ["chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.delete, message.get_bot(), "delete_message")
|
|
|
|
assert await check_defaults_handling(message.delete, message.get_bot())
|
2020-12-30 13:41:07 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "delete_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.delete()
|
2017-08-11 23:58:41 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_stop_poll(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.stop_poll, Bot.stop_poll, ["chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.stop_poll, message.get_bot(), "stop_poll")
|
|
|
|
assert await check_defaults_handling(message.stop_poll, message.get_bot())
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "stop_poll", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.stop_poll()
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_pin(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*args, **kwargs):
|
2020-08-13 13:39:43 +02:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.pin, Bot.pin_chat_message, ["chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(message.pin, message.get_bot(), "pin_chat_message")
|
|
|
|
assert await check_defaults_handling(message.pin, message.get_bot())
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "pin_chat_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.pin()
|
2020-08-13 13:39:43 +02:00
|
|
|
|
2022-04-24 12:38:09 +02:00
|
|
|
async def test_unpin(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*args, **kwargs):
|
2020-11-29 16:20:46 +01:00
|
|
|
chat_id = kwargs["chat_id"] == message.chat_id
|
|
|
|
message_id = kwargs["message_id"] == message.message_id
|
2021-02-19 19:07:48 +01:00
|
|
|
return chat_id and message_id
|
2020-12-30 13:41:07 +01:00
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.unpin, Bot.unpin_chat_message, ["chat_id", "message_id"], []
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_shortcut_call(
|
2021-02-19 19:07:48 +01:00
|
|
|
message.unpin,
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot(),
|
2021-02-19 19:07:48 +01:00
|
|
|
"unpin_chat_message",
|
|
|
|
shortcut_kwargs=["chat_id", "message_id"],
|
|
|
|
)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await check_defaults_handling(message.unpin, message.get_bot())
|
2020-11-29 16:20:46 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
monkeypatch.setattr(message.get_bot(), "unpin_chat_message", make_assertion)
|
2022-04-24 12:38:09 +02:00
|
|
|
assert await message.unpin()
|
2020-11-29 16:20:46 +01:00
|
|
|
|
2020-02-06 11:22:56 +01:00
|
|
|
def test_default_quote(self, message):
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot()._defaults = Defaults()
|
2020-02-06 11:22:56 +01:00
|
|
|
|
2021-01-07 21:31:00 +01:00
|
|
|
try:
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot().defaults._quote = False
|
2021-01-07 21:31:00 +01:00
|
|
|
assert message._quote(None, None) is None
|
2020-02-06 11:22:56 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot().defaults._quote = True
|
2021-01-07 21:31:00 +01:00
|
|
|
assert message._quote(None, None) == message.message_id
|
2020-02-06 11:22:56 +01:00
|
|
|
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot().defaults._quote = None
|
2021-01-07 21:31:00 +01:00
|
|
|
message.chat.type = Chat.PRIVATE
|
|
|
|
assert message._quote(None, None) is None
|
2020-02-06 11:22:56 +01:00
|
|
|
|
2021-01-07 21:31:00 +01:00
|
|
|
message.chat.type = Chat.GROUP
|
|
|
|
assert message._quote(None, None)
|
|
|
|
finally:
|
2021-10-21 11:17:12 +02:00
|
|
|
message.get_bot()._defaults = None
|
2020-02-06 11:22:56 +01:00
|
|
|
|
2022-11-22 10:43:50 +01:00
|
|
|
async def test_edit_forum_topic(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
|
|
|
return (
|
|
|
|
kwargs["chat_id"] == message.chat_id
|
|
|
|
and kwargs["message_thread_id"] == message.message_thread_id
|
|
|
|
and kwargs["name"] == "New Name"
|
|
|
|
and kwargs["icon_custom_emoji_id"] == "12345"
|
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.edit_forum_topic, Bot.edit_forum_topic, ["chat_id", "message_thread_id"], []
|
|
|
|
)
|
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.edit_forum_topic,
|
|
|
|
message.get_bot(),
|
|
|
|
"edit_forum_topic",
|
|
|
|
shortcut_kwargs=["chat_id", "message_thread_id"],
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.edit_forum_topic, message.get_bot())
|
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "edit_forum_topic", make_assertion)
|
|
|
|
assert await message.edit_forum_topic(name="New Name", icon_custom_emoji_id="12345")
|
|
|
|
|
|
|
|
async def test_close_forum_topic(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
|
|
|
return (
|
|
|
|
kwargs["chat_id"] == message.chat_id
|
|
|
|
and kwargs["message_thread_id"] == message.message_thread_id
|
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.close_forum_topic, Bot.close_forum_topic, ["chat_id", "message_thread_id"], []
|
|
|
|
)
|
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.close_forum_topic,
|
|
|
|
message.get_bot(),
|
|
|
|
"close_forum_topic",
|
|
|
|
shortcut_kwargs=["chat_id", "message_thread_id"],
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.close_forum_topic, message.get_bot())
|
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "close_forum_topic", make_assertion)
|
|
|
|
assert await message.close_forum_topic()
|
|
|
|
|
|
|
|
async def test_reopen_forum_topic(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
|
|
|
return (
|
|
|
|
kwargs["chat_id"] == message.chat_id
|
|
|
|
and kwargs["message_thread_id"] == message.message_thread_id
|
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.reopen_forum_topic,
|
|
|
|
Bot.reopen_forum_topic,
|
|
|
|
["chat_id", "message_thread_id"],
|
|
|
|
[],
|
|
|
|
)
|
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.reopen_forum_topic,
|
|
|
|
message.get_bot(),
|
|
|
|
"reopen_forum_topic",
|
|
|
|
shortcut_kwargs=["chat_id", "message_thread_id"],
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.reopen_forum_topic, message.get_bot())
|
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "reopen_forum_topic", make_assertion)
|
|
|
|
assert await message.reopen_forum_topic()
|
|
|
|
|
|
|
|
async def test_delete_forum_topic(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
|
|
|
return (
|
|
|
|
kwargs["chat_id"] == message.chat_id
|
|
|
|
and kwargs["message_thread_id"] == message.message_thread_id
|
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.delete_forum_topic,
|
|
|
|
Bot.delete_forum_topic,
|
|
|
|
["chat_id", "message_thread_id"],
|
|
|
|
[],
|
|
|
|
)
|
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.delete_forum_topic,
|
|
|
|
message.get_bot(),
|
|
|
|
"delete_forum_topic",
|
|
|
|
shortcut_kwargs=["chat_id", "message_thread_id"],
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(message.delete_forum_topic, message.get_bot())
|
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "delete_forum_topic", make_assertion)
|
|
|
|
assert await message.delete_forum_topic()
|
|
|
|
|
|
|
|
async def test_unpin_all_forum_topic_messages(self, monkeypatch, message):
|
|
|
|
async def make_assertion(*_, **kwargs):
|
|
|
|
return (
|
|
|
|
kwargs["chat_id"] == message.chat_id
|
|
|
|
and kwargs["message_thread_id"] == message.message_thread_id
|
|
|
|
)
|
|
|
|
|
|
|
|
assert check_shortcut_signature(
|
|
|
|
Message.unpin_all_forum_topic_messages,
|
|
|
|
Bot.unpin_all_forum_topic_messages,
|
|
|
|
["chat_id", "message_thread_id"],
|
|
|
|
[],
|
|
|
|
)
|
|
|
|
assert await check_shortcut_call(
|
|
|
|
message.unpin_all_forum_topic_messages,
|
|
|
|
message.get_bot(),
|
|
|
|
"unpin_all_forum_topic_messages",
|
|
|
|
shortcut_kwargs=["chat_id", "message_thread_id"],
|
|
|
|
)
|
|
|
|
assert await check_defaults_handling(
|
|
|
|
message.unpin_all_forum_topic_messages, message.get_bot()
|
|
|
|
)
|
|
|
|
|
|
|
|
monkeypatch.setattr(message.get_bot(), "unpin_all_forum_topic_messages", make_assertion)
|
|
|
|
assert await message.unpin_all_forum_topic_messages()
|
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
def test_equality(self):
|
2020-02-23 22:03:58 +01:00
|
|
|
id_ = 1
|
2020-10-06 19:28:40 +02:00
|
|
|
a = Message(
|
|
|
|
id_,
|
|
|
|
self.date,
|
|
|
|
self.chat,
|
|
|
|
from_user=self.from_user,
|
|
|
|
)
|
|
|
|
b = Message(
|
|
|
|
id_,
|
|
|
|
self.date,
|
|
|
|
self.chat,
|
|
|
|
from_user=self.from_user,
|
|
|
|
)
|
|
|
|
c = Message(id_, self.date, Chat(123, Chat.GROUP), from_user=User(0, "", False))
|
|
|
|
d = Message(0, self.date, self.chat, from_user=self.from_user)
|
2020-02-23 22:03:58 +01:00
|
|
|
e = Update(id_)
|
2017-08-11 23:58:41 +02:00
|
|
|
|
|
|
|
assert a == b
|
|
|
|
assert hash(a) == hash(b)
|
|
|
|
assert a is not b
|
2017-08-07 23:25:19 +02:00
|
|
|
|
2020-07-14 21:33:56 +02:00
|
|
|
assert a != c
|
|
|
|
assert hash(a) != hash(c)
|
2017-08-07 23:25:19 +02:00
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
assert a != d
|
|
|
|
assert hash(a) != hash(d)
|
2016-09-07 08:49:09 +02:00
|
|
|
|
2017-08-11 23:58:41 +02:00
|
|
|
assert a != e
|
|
|
|
assert hash(a) != hash(e)
|