python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-12 02:03:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix f70d45c & e90ca7c

Browse source
This commit is contained in:
Alex Root Junior 2017-08-04 14:08:51 +03:00
parent 143270bdae
commit c9e7be97f2
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aiogram/dispatcher/filters.py
View file

@ -81,7 +81,7 @@ class ContentTypeFilter(Filter):
self.content_types = content_types self.content_types = content_types
def check(self, message): def check(self, message):
return message.content_type[0] in self.content_types return message.content_type in self.content_types
class CancelFilter(Filter): class CancelFilter(Filter):

27
aiogram/types/message.py
View file

@ -118,33 +118,32 @@ class Message(Deserializable):
invoice = Invoice.deserialize(raw_data.get('invoice')) invoice = Invoice.deserialize(raw_data.get('invoice'))
successful_payment = SuccessfulPayment.deserialize(raw_data.get('successful_payment')) successful_payment = SuccessfulPayment.deserialize(raw_data.get('successful_payment'))
# TODO: ContentType helper always return list. Don't forget that! (Fix it after merging fsm into dev branch)
if text: if text:
content_type = ContentType.TEXT content_type = ContentType.TEXT[0]
elif audio: elif audio:
content_type = ContentType.AUDIO content_type = ContentType.AUDIO[0]
elif document: elif document:
content_type = ContentType.DOCUMENT content_type = ContentType.DOCUMENT[0]
elif game: elif game:
content_type = ContentType.GAME content_type = ContentType.GAME[0]
elif photo: elif photo:
content_type = ContentType.PHOTO content_type = ContentType.PHOTO[0]
elif sticker: elif sticker:
content_type = ContentType.STICKER content_type = ContentType.STICKER[0]
elif video: elif video:
content_type = ContentType.VIDEO content_type = ContentType.VIDEO[0]
elif voice: elif voice:
content_type = ContentType.VOICE content_type = ContentType.VOICE[0]
elif new_chat_members: elif new_chat_members:
content_type = ContentType.NEW_CHAT_MEMBERS content_type = ContentType.NEW_CHAT_MEMBERS[0]
elif left_chat_member: elif left_chat_member:
content_type = ContentType.LEFT_CHAT_MEMBER content_type = ContentType.LEFT_CHAT_MEMBER[0]
elif invoice: elif invoice:
content_type = ContentType.INVOICE content_type = ContentType.INVOICE[0]
elif successful_payment: elif successful_payment:
content_type = ContentType.SUCCESSFUL_PAYMENT content_type = ContentType.SUCCESSFUL_PAYMENT[0]
else: else:
content_type = ContentType.UNKNOWN content_type = ContentType.UNKNOWN[0]
return Message(message_id, from_user, date, chat, forward_from, forward_from_chat, forward_from_message_id, return Message(message_id, from_user, date, chat, forward_from, forward_from_chat, forward_from_message_id,
forward_date, reply_to_message, edit_date, text, entities, audio, document, game, photo, sticker, forward_date, reply_to_message, edit_date, text, entities, audio, document, game, photo, sticker,