Merge branch 'dev-1.x' of github.com:aiogram/aiogram into dev-1.x

This commit is contained in:
Alex Root Junior 2018-02-08 21:35:01 +02:00
commit 483c1b295d

View file

@ -100,6 +100,8 @@ class Message(base.TelegramObject):
return ContentType.VENUE[0] return ContentType.VENUE[0]
if self.new_chat_members: if self.new_chat_members:
return ContentType.NEW_CHAT_MEMBERS[0] return ContentType.NEW_CHAT_MEMBERS[0]
if self.left_chat_member:
return ContentType.LEFT_CHAT_MEMBER[0]
if self.invoice: if self.invoice:
return ContentType.INVOICE[0] return ContentType.INVOICE[0]
if self.successful_payment: if self.successful_payment:
@ -655,6 +657,7 @@ class ContentType(helper.Helper):
:key: LOCATION :key: LOCATION
:key: VENUE :key: VENUE
:key: NEW_CHAT_MEMBERS :key: NEW_CHAT_MEMBERS
:key: LEFT_CHAT_MEMBER
:key: INVOICE :key: INVOICE
:key: SUCCESSFUL_PAYMENT :key: SUCCESSFUL_PAYMENT
""" """
@ -673,6 +676,7 @@ class ContentType(helper.Helper):
LOCATION = helper.ListItem() # location LOCATION = helper.ListItem() # location
VENUE = helper.ListItem() # venue VENUE = helper.ListItem() # venue
NEW_CHAT_MEMBERS = helper.ListItem() # new_chat_member NEW_CHAT_MEMBERS = helper.ListItem() # new_chat_member
LEFT_CHAT_MEMBER = helper.ListItem() # left_chat_member
INVOICE = helper.ListItem() # invoice INVOICE = helper.ListItem() # invoice
SUCCESSFUL_PAYMENT = helper.ListItem() # successful_payment SUCCESSFUL_PAYMENT = helper.ListItem() # successful_payment