python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2026-04-08 16:37:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev-2.x

Browse source 
# Conflicts:
#	aiogram/__init__.py
#	aiogram/utils/json.py
This commit is contained in:
Alex Root Junior 2018-08-03 23:14:25 +03:00
commit 272cf155f2
21 changed files with 623 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
aiogram/types/message.py
View file

@ -7,6 +7,7 @@ import typing
from . import base
from . import fields
from .animation import Animation
from .audio import Audio
from .chat import Chat
from .contact import Contact
@ -15,6 +16,7 @@ from .game import Game
from .invoice import Invoice
from .location import Location
from .message_entity import MessageEntity
from .passport_data import PassportData
from .photo_size import PhotoSize
from .sticker import Sticker
from .successful_payment import SuccessfulPayment
@ -51,6 +53,7 @@ class Message(base.TelegramObject):
caption_entities: typing.List[MessageEntity] = fields.ListField(base=MessageEntity)
audio: Audio = fields.Field(base=Audio)
document: Document = fields.Field(base=Document)
animation: Animation = fields.Field(base=Animation)
game: Game = fields.Field(base=Game)
photo: typing.List[PhotoSize] = fields.ListField(base=PhotoSize)
sticker: Sticker = fields.Field(base=Sticker)
@ -75,6 +78,7 @@ class Message(base.TelegramObject):
invoice: Invoice = fields.Field(base=Invoice)
successful_payment: SuccessfulPayment = fields.Field(base=SuccessfulPayment)
connected_website: base.String = fields.Field()
passport_data: PassportData = fields.Field(base=PassportData)
@property
@functools.lru_cache()
@ -83,6 +87,8 @@ class Message(base.TelegramObject):
return ContentType.TEXT[0]
elif self.audio:
return ContentType.AUDIO[0]
elif self.animation:
return ContentType.ANIMATION[0]
elif self.document:
return ContentType.DOCUMENT[0]
elif self.game:
@ -127,6 +133,8 @@ class Message(base.TelegramObject):
return ContentType.DELETE_CHAT_PHOTO[0]
elif self.group_chat_created:
return ContentType.GROUP_CHAT_CREATED[0]
elif self.passport_data:
return ContentType.PASSPORT_DATA[0]
else:
return ContentType.UNKNOWN[0]
@ -750,6 +758,7 @@ class ContentType(helper.Helper):
TEXT = helper.ListItem() # text
AUDIO = helper.ListItem() # audio
DOCUMENT = helper.ListItem() # document
ANIMATION = helper.ListItem() # animation
GAME = helper.ListItem() # game
PHOTO = helper.ListItem() # photo
STICKER = helper.ListItem() # sticker
@ -771,6 +780,7 @@ class ContentType(helper.Helper):
NEW_CHAT_PHOTO = helper.ListItem() # new_chat_photo
DELETE_CHAT_PHOTO = helper.ListItem() # delete_chat_photo
GROUP_CHAT_CREATED = helper.ListItem() # group_chat_created
PASSPORT_DATA = helper.ListItem() # passport_data
UNKNOWN = helper.ListItem() # unknown
ANY = helper.ListItem() # any