mirror of
https://github.com/aiogram/aiogram.git
synced 2025-12-06 16:15:51 +00:00
Fixed link preview options to use global defaults in some types and methods (#1563)
* #1543 Fixed link preview options to use global defaults Refactor various classes to use global defaults for `link_preview_options`. This change ensures consistency and enhances flexibility in handling link preview options across different components. * Added changelog
This commit is contained in:
parent
6aba60155c
commit
627ee09928
8 changed files with 23 additions and 12 deletions
|
|
@ -1,2 +1,3 @@
|
||||||
disable_web_page_preview: link_preview_is_disabled
|
disable_web_page_preview: link_preview_is_disabled
|
||||||
|
link_preview_options: link_preview
|
||||||
parse_mode: parse_mode
|
parse_mode: parse_mode
|
||||||
|
|
|
||||||
2
.butcher/types/ExternalReplyInfo/default.yml
Normal file
2
.butcher/types/ExternalReplyInfo/default.yml
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
disable_web_page_preview: link_preview_is_disabled
|
||||||
|
parse_mode: parse_mode
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
disable_web_page_preview: disable_web_page_preview
|
link_preview_options: link_preview
|
||||||
parse_mode: parse_mode
|
parse_mode: parse_mode
|
||||||
|
|
|
||||||
4
CHANGES/1543.bugfix.rst
Normal file
4
CHANGES/1543.bugfix.rst
Normal file
|
|
@ -0,0 +1,4 @@
|
||||||
|
Fixed link preview options to use global defaults in various types and methods
|
||||||
|
to use global defaults for `link_preview_options`.
|
||||||
|
This change ensures consistency and enhances flexibility in handling link preview options
|
||||||
|
across different components.
|
||||||
|
|
@ -1526,7 +1526,9 @@ class Bot:
|
||||||
inline_message_id: Optional[str] = None,
|
inline_message_id: Optional[str] = None,
|
||||||
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
||||||
entities: Optional[List[MessageEntity]] = None,
|
entities: Optional[List[MessageEntity]] = None,
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None,
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default(
|
||||||
|
"link_preview"
|
||||||
|
),
|
||||||
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
||||||
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
||||||
"link_preview_is_disabled"
|
"link_preview_is_disabled"
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@ class EditMessageText(TelegramMethod[Union[Message, bool]]):
|
||||||
"""Mode for parsing entities in the message text. See `formatting options <https://core.telegram.org/bots/api#formatting-options>`_ for more details."""
|
"""Mode for parsing entities in the message text. See `formatting options <https://core.telegram.org/bots/api#formatting-options>`_ for more details."""
|
||||||
entities: Optional[List[MessageEntity]] = None
|
entities: Optional[List[MessageEntity]] = None
|
||||||
"""A JSON-serialized list of special entities that appear in message text, which can be specified instead of *parse_mode*"""
|
"""A JSON-serialized list of special entities that appear in message text, which can be specified instead of *parse_mode*"""
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default("link_preview")
|
||||||
"""Link preview generation options for the message"""
|
"""Link preview generation options for the message"""
|
||||||
reply_markup: Optional[InlineKeyboardMarkup] = None
|
reply_markup: Optional[InlineKeyboardMarkup] = None
|
||||||
"""A JSON-serialized object for an `inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_."""
|
"""A JSON-serialized object for an `inline keyboard <https://core.telegram.org/bots/features#inline-keyboards>`_."""
|
||||||
|
|
@ -65,7 +65,9 @@ class EditMessageText(TelegramMethod[Union[Message, bool]]):
|
||||||
inline_message_id: Optional[str] = None,
|
inline_message_id: Optional[str] = None,
|
||||||
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
||||||
entities: Optional[List[MessageEntity]] = None,
|
entities: Optional[List[MessageEntity]] = None,
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None,
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default(
|
||||||
|
"link_preview"
|
||||||
|
),
|
||||||
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
||||||
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
||||||
"link_preview_is_disabled"
|
"link_preview_is_disabled"
|
||||||
|
|
|
||||||
|
|
@ -25,11 +25,9 @@ class InputTextMessageContent(InputMessageContent):
|
||||||
"""*Optional*. Mode for parsing entities in the message text. See `formatting options <https://core.telegram.org/bots/api#formatting-options>`_ for more details."""
|
"""*Optional*. Mode for parsing entities in the message text. See `formatting options <https://core.telegram.org/bots/api#formatting-options>`_ for more details."""
|
||||||
entities: Optional[List[MessageEntity]] = None
|
entities: Optional[List[MessageEntity]] = None
|
||||||
"""*Optional*. List of special entities that appear in message text, which can be specified instead of *parse_mode*"""
|
"""*Optional*. List of special entities that appear in message text, which can be specified instead of *parse_mode*"""
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default("link_preview")
|
||||||
"""*Optional*. Link preview generation options for the message"""
|
"""*Optional*. Link preview generation options for the message"""
|
||||||
disable_web_page_preview: Optional[Union[bool, Default]] = Field(
|
disable_web_page_preview: Optional[bool] = Field(None, json_schema_extra={"deprecated": True})
|
||||||
Default("disable_web_page_preview"), json_schema_extra={"deprecated": True}
|
|
||||||
)
|
|
||||||
"""*Optional*. Disables link previews for links in the sent message
|
"""*Optional*. Disables link previews for links in the sent message
|
||||||
|
|
||||||
.. deprecated:: API:7.0
|
.. deprecated:: API:7.0
|
||||||
|
|
@ -45,10 +43,10 @@ class InputTextMessageContent(InputMessageContent):
|
||||||
message_text: str,
|
message_text: str,
|
||||||
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
||||||
entities: Optional[List[MessageEntity]] = None,
|
entities: Optional[List[MessageEntity]] = None,
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None,
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default(
|
||||||
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
"link_preview"
|
||||||
"disable_web_page_preview"
|
|
||||||
),
|
),
|
||||||
|
disable_web_page_preview: Optional[bool] = None,
|
||||||
**__pydantic_kwargs: Any,
|
**__pydantic_kwargs: Any,
|
||||||
) -> None:
|
) -> None:
|
||||||
# DO NOT EDIT MANUALLY!!!
|
# DO NOT EDIT MANUALLY!!!
|
||||||
|
|
|
||||||
|
|
@ -3524,7 +3524,9 @@ class Message(MaybeInaccessibleMessage):
|
||||||
inline_message_id: Optional[str] = None,
|
inline_message_id: Optional[str] = None,
|
||||||
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
parse_mode: Optional[Union[str, Default]] = Default("parse_mode"),
|
||||||
entities: Optional[List[MessageEntity]] = None,
|
entities: Optional[List[MessageEntity]] = None,
|
||||||
link_preview_options: Optional[LinkPreviewOptions] = None,
|
link_preview_options: Optional[Union[LinkPreviewOptions, Default]] = Default(
|
||||||
|
"link_preview"
|
||||||
|
),
|
||||||
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
reply_markup: Optional[InlineKeyboardMarkup] = None,
|
||||||
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
disable_web_page_preview: Optional[Union[bool, Default]] = Default(
|
||||||
"link_preview_is_disabled"
|
"link_preview_is_disabled"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue