From e90ca7cfae4a5118624d83b971988d1dcba7ea96 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Sat, 29 Jul 2017 04:46:41 +0300 Subject: [PATCH] Use ListItem by default in ContentType helper. --- aiogram/types/message.py | 26 +++++++++++++------------- examples/steps_and_downloading_file.py | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aiogram/types/message.py b/aiogram/types/message.py index c4361a42..bdd02c46 100644 --- a/aiogram/types/message.py +++ b/aiogram/types/message.py @@ -1,6 +1,6 @@ import datetime -from aiogram.utils.helper import Item, HelperMode, Helper +from aiogram.utils.helper import Item, HelperMode, Helper, ListItem from .audio import Audio from .base import Deserializable from .chat import Chat @@ -259,18 +259,18 @@ class ContentType(Helper): """ mode = HelperMode.lower_case - TEXT = Item() # text - AUDIO = Item() # audio - DOCUMENT = Item() # document - GAME = Item() # game - PHOTO = Item() # photo - STICKER = Item() # sticker - VIDEO = Item() # video - VOICE = Item() # voice - NEW_CHAT_MEMBERS = Item() # new_chat_members - LEFT_CHAT_MEMBER = Item() # left_chat_member - INVOICE = Item() # invoice - SUCCESSFUL_PAYMENT = Item() # successful_payment + TEXT = ListItem() # text + AUDIO = ListItem() # audio + DOCUMENT = ListItem() # document + GAME = ListItem() # game + PHOTO = ListItem() # photo + STICKER = ListItem() # sticker + VIDEO = ListItem() # video + VOICE = ListItem() # voice + NEW_CHAT_MEMBERS = ListItem() # new_chat_members + LEFT_CHAT_MEMBER = ListItem() # left_chat_member + INVOICE = ListItem() # invoice + SUCCESSFUL_PAYMENT = ListItem() # successful_payment UNKNOWN = 'unknown' diff --git a/examples/steps_and_downloading_file.py b/examples/steps_and_downloading_file.py index f411a44f..63f38777 100644 --- a/examples/steps_and_downloading_file.py +++ b/examples/steps_and_downloading_file.py @@ -36,7 +36,7 @@ async def save_sticker(message: types.Message): # Wait next message # It can only be a sticker msg = await dp.next_message(message, - content_types=[ContentType.STICKER], + content_types=ContentType.STICKER, otherwise=handle_bad_message, include_cancel=True)