mirror of
https://github.com/python-telegram-bot/python-telegram-bot.git
synced 2024-12-23 06:50:29 +01:00
4689a80c2e
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>
90 lines
2.5 KiB
Python
90 lines
2.5 KiB
Python
#!/usr/bin/env python
|
|
#
|
|
# A library that provides a Python interface to the Telegram Bot API
|
|
# Copyright (C) 2015-2018
|
|
# 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/].
|
|
"""Base class for Telegram Objects."""
|
|
|
|
try:
|
|
import ujson as json
|
|
except ImportError:
|
|
import json
|
|
|
|
from abc import ABCMeta
|
|
|
|
|
|
class TelegramObject(object):
|
|
"""Base class for most telegram objects."""
|
|
|
|
__metaclass__ = ABCMeta
|
|
_id_attrs = ()
|
|
|
|
def __str__(self):
|
|
return str(self.to_dict())
|
|
|
|
def __getitem__(self, item):
|
|
return self.__dict__[item]
|
|
|
|
@classmethod
|
|
def de_json(cls, data, bot):
|
|
if not data:
|
|
return None
|
|
|
|
data = data.copy()
|
|
|
|
return data
|
|
|
|
def to_json(self):
|
|
"""
|
|
Returns:
|
|
:obj:`str`
|
|
|
|
"""
|
|
|
|
return json.dumps(self.to_dict())
|
|
|
|
def to_dict(self):
|
|
data = dict()
|
|
|
|
for key in iter(self.__dict__):
|
|
if key in ('bot',
|
|
'_id_attrs',
|
|
'_credentials',
|
|
'_decrypted_credentials',
|
|
'_decrypted_data',
|
|
'_decrypted_secret'):
|
|
continue
|
|
|
|
value = self.__dict__[key]
|
|
if value is not None:
|
|
if hasattr(value, 'to_dict'):
|
|
data[key] = value.to_dict()
|
|
else:
|
|
data[key] = value
|
|
|
|
if data.get('from_user'):
|
|
data['from'] = data.pop('from_user', None)
|
|
return data
|
|
|
|
def __eq__(self, other):
|
|
if isinstance(other, self.__class__):
|
|
return self._id_attrs == other._id_attrs
|
|
return super(TelegramObject, self).__eq__(other) # pylint: disable=no-member
|
|
|
|
def __hash__(self):
|
|
if self._id_attrs:
|
|
return hash((self.__class__, self._id_attrs)) # pylint: disable=no-member
|
|
return super(TelegramObject, self).__hash__()
|