From 249583646917332be36fd0da17ef1c21b7e5c3c4 Mon Sep 17 00:00:00 2001 From: Alex Root Junior Date: Mon, 16 Nov 2020 04:11:13 +0200 Subject: [PATCH] Regen code (Bot API 5.0) --- aiogram/api/methods/base.py | 2 +- aiogram/api/methods/edit_message_media.py | 4 ++-- aiogram/api/methods/send_media_group.py | 11 +++++++++-- aiogram/api/types/inline_query_result_video.py | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/aiogram/api/methods/base.py b/aiogram/api/methods/base.py index 19632b37..4a78cbee 100644 --- a/aiogram/api/methods/base.py +++ b/aiogram/api/methods/base.py @@ -149,7 +149,7 @@ def prepare_parse_mode( entities_property=entities_property, ) elif root.get(parse_mode_property, UNSET) is UNSET: - if bot.parse_mode and not root.get(entities_property, None): + if bot.parse_mode and root.get(entities_property, None) is None: root[parse_mode_property] = bot.parse_mode else: root[parse_mode_property] = None diff --git a/aiogram/api/methods/edit_message_media.py b/aiogram/api/methods/edit_message_media.py index 1c9f9f9c..f03272f3 100644 --- a/aiogram/api/methods/edit_message_media.py +++ b/aiogram/api/methods/edit_message_media.py @@ -2,8 +2,8 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Dict, Optional, Union -from ..types import InlineKeyboardMarkup, InputMedia, Message, InputFile -from .base import Request, TelegramMethod, prepare_parse_mode, prepare_media_file +from ..types import InlineKeyboardMarkup, InputFile, InputMedia, Message +from .base import Request, TelegramMethod, prepare_media_file, prepare_parse_mode if TYPE_CHECKING: # pragma: no cover from ..client.bot import Bot diff --git a/aiogram/api/methods/send_media_group.py b/aiogram/api/methods/send_media_group.py index 6f60f7ed..a67a30fa 100644 --- a/aiogram/api/methods/send_media_group.py +++ b/aiogram/api/methods/send_media_group.py @@ -2,8 +2,15 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union -from ..types import InputMediaAudio, InputMediaDocument, InputMediaPhoto, InputMediaVideo -from .base import Request, TelegramMethod +from ..types import ( + InputFile, + InputMediaAudio, + InputMediaDocument, + InputMediaPhoto, + InputMediaVideo, + Message, +) +from .base import Request, TelegramMethod, prepare_input_media, prepare_parse_mode if TYPE_CHECKING: # pragma: no cover from ..client.bot import Bot diff --git a/aiogram/api/types/inline_query_result_video.py b/aiogram/api/types/inline_query_result_video.py index 68239fd0..07e4af97 100644 --- a/aiogram/api/types/inline_query_result_video.py +++ b/aiogram/api/types/inline_query_result_video.py @@ -40,6 +40,9 @@ class InlineQueryResultVideo(InlineQueryResult): """Caption of the video to be sent, 0-1024 characters after entities parsing""" parse_mode: Optional[str] = UNSET """Mode for parsing entities in the video caption. See formatting options for more details.""" + caption_entities: Optional[List[MessageEntity]] = None + """List of special entities that appear in the caption, which can be specified instead of + parse_mode""" video_width: Optional[int] = None """Video width""" video_height: Optional[int] = None