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
|
|
|
#!/usr/bin/env python
|
|
|
|
#
|
|
|
|
# A library that provides a Python interface to the Telegram Bot API
|
2020-02-02 22:08:54 +01:00
|
|
|
# Copyright (C) 2015-2020
|
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
|
|
|
# Leandro Toledo de Souza <devs@python-telegram-bot.org>
|
|
|
|
#
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU Lesser Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU Lesser Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU Lesser Public License
|
|
|
|
# along with this program. If not, see [http://www.gnu.org/licenses/].
|
|
|
|
"""Contains information about Telegram Passport data shared with the bot by the user."""
|
|
|
|
|
|
|
|
from telegram import EncryptedCredentials, EncryptedPassportElement, TelegramObject
|
|
|
|
|
|
|
|
|
|
|
|
class PassportData(TelegramObject):
|
|
|
|
"""Contains information about Telegram Passport data shared with the bot by the user.
|
|
|
|
|
|
|
|
Attributes:
|
|
|
|
data (List[:class:`telegram.EncryptedPassportElement`]): Array with encrypted information
|
|
|
|
about documents and other Telegram Passport elements that was shared with the bot.
|
|
|
|
credentials (:class:`telegram.EncryptedCredentials`): Encrypted credentials.
|
|
|
|
bot (:class:`telegram.Bot`, optional): The Bot to use for instance methods.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
data (List[:class:`telegram.EncryptedPassportElement`]): Array with encrypted information
|
|
|
|
about documents and other Telegram Passport elements that was shared with the bot.
|
|
|
|
credentials (:obj:`str`): Encrypted credentials.
|
|
|
|
bot (:class:`telegram.Bot`, optional): The Bot to use for instance methods.
|
|
|
|
**kwargs (:obj:`dict`): Arbitrary keyword arguments.
|
|
|
|
|
|
|
|
Note:
|
|
|
|
To be able to decrypt this object, you must pass your private_key to either
|
|
|
|
:class:`telegram.Updater` or :class:`telegram.Bot`. Decrypted data is then found in
|
|
|
|
:attr:`decrypted_data` and the payload can be found in :attr:`decrypted_credentials`'s
|
|
|
|
attribute :attr:`telegram.Credentials.payload`.
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, data, credentials, bot=None, **kwargs):
|
|
|
|
self.data = data
|
|
|
|
self.credentials = credentials
|
|
|
|
|
|
|
|
self.bot = bot
|
|
|
|
self._decrypted_data = None
|
|
|
|
self._id_attrs = tuple([x.type for x in data] + [credentials.hash])
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def de_json(cls, data, bot):
|
|
|
|
if not data:
|
|
|
|
return None
|
|
|
|
|
|
|
|
data = super(PassportData, cls).de_json(data, bot)
|
|
|
|
|
|
|
|
data['data'] = EncryptedPassportElement.de_list(data.get('data'), bot)
|
|
|
|
data['credentials'] = EncryptedCredentials.de_json(data.get('credentials'), bot)
|
|
|
|
|
|
|
|
return cls(bot=bot, **data)
|
|
|
|
|
|
|
|
def to_dict(self):
|
|
|
|
data = super(PassportData, self).to_dict()
|
|
|
|
|
|
|
|
data['data'] = [e.to_dict() for e in self.data]
|
|
|
|
|
|
|
|
return data
|
|
|
|
|
|
|
|
@property
|
|
|
|
def decrypted_data(self):
|
|
|
|
"""
|
|
|
|
List[:class:`telegram.EncryptedPassportElement`]: Lazily decrypt and return information
|
|
|
|
about documents and other Telegram Passport elements which were shared with the bot.
|
|
|
|
|
|
|
|
Raises:
|
|
|
|
telegram.TelegramDecryptionError: Decryption failed. Usually due to bad
|
|
|
|
private/public key but can also suggest malformed/tampered data.
|
|
|
|
"""
|
|
|
|
if self._decrypted_data is None:
|
|
|
|
self._decrypted_data = [
|
|
|
|
EncryptedPassportElement.de_json_decrypted(element.to_dict(),
|
|
|
|
self.bot,
|
|
|
|
self.decrypted_credentials)
|
|
|
|
for element in self.data
|
|
|
|
]
|
|
|
|
return self._decrypted_data
|
|
|
|
|
|
|
|
@property
|
|
|
|
def decrypted_credentials(self):
|
|
|
|
"""
|
|
|
|
:class:`telegram.Credentials`: Lazily decrypt and return credentials that were used
|
|
|
|
to decrypt the data. This object also contains the user specified payload as
|
|
|
|
`decrypted_data.payload`.
|
|
|
|
|
|
|
|
Raises:
|
|
|
|
telegram.TelegramDecryptionError: Decryption failed. Usually due to bad
|
|
|
|
private/public key but can also suggest malformed/tampered data.
|
|
|
|
"""
|
|
|
|
return self.credentials.decrypted_data
|