From af53c4eb453d07f8dda859cce08e1094854b2adb Mon Sep 17 00:00:00 2001 From: JRoot Junior Date: Sat, 4 Apr 2026 00:57:49 +0300 Subject: [PATCH] Set `description_parse_mode` default to `"parse_mode"` and use `DateTime` for `addition_date` in `PollOption` --- .butcher/methods/sendPoll/default.yml | 1 + .butcher/types/PollOption/replace.yml | 5 +++++ aiogram/client/bot.py | 2 +- aiogram/methods/send_poll.py | 4 ++-- aiogram/types/chat_join_request.py | 4 ++-- aiogram/types/chat_member_updated.py | 2 +- aiogram/types/inaccessible_message.py | 4 ++-- aiogram/types/message.py | 4 ++-- aiogram/types/poll_option.py | 5 +++-- 9 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 .butcher/types/PollOption/replace.yml diff --git a/.butcher/methods/sendPoll/default.yml b/.butcher/methods/sendPoll/default.yml index 26ac273c..de1aec36 100644 --- a/.butcher/methods/sendPoll/default.yml +++ b/.butcher/methods/sendPoll/default.yml @@ -1,3 +1,4 @@ explanation_parse_mode: parse_mode question_parse_mode: parse_mode +description_parse_mode: parse_mode protect_content: protect_content diff --git a/.butcher/types/PollOption/replace.yml b/.butcher/types/PollOption/replace.yml new file mode 100644 index 00000000..a2abf27d --- /dev/null +++ b/.butcher/types/PollOption/replace.yml @@ -0,0 +1,5 @@ +annotations: + addition_date: + parsed_type: + type: std + name: DateTime diff --git a/aiogram/client/bot.py b/aiogram/client/bot.py index 44ddcb68..e85c1367 100644 --- a/aiogram/client/bot.py +++ b/aiogram/client/bot.py @@ -3025,7 +3025,7 @@ class Bot: close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/methods/send_poll.py b/aiogram/methods/send_poll.py index e1ac86a9..b089b181 100644 --- a/aiogram/methods/send_poll.py +++ b/aiogram/methods/send_poll.py @@ -71,7 +71,7 @@ class SendPoll(TelegramMethod[Message]): """Pass :code:`True` if the poll needs to be immediately closed. This can be useful for poll preview.""" description: str | None = None """Description of the poll to be sent, 0-1024 characters after entities parsing""" - description_parse_mode: str | None = None + description_parse_mode: str | Default | None = Default("parse_mode") """Mode for parsing entities in the poll description. See `formatting options `_ for more details.""" description_entities: list[MessageEntity] | None = None """A JSON-serialized list of special entities that appear in the poll description, which can be specified instead of *description_parse_mode*""" @@ -132,7 +132,7 @@ class SendPoll(TelegramMethod[Message]): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/types/chat_join_request.py b/aiogram/types/chat_join_request.py index 62f6e917..46f14d32 100644 --- a/aiogram/types/chat_join_request.py +++ b/aiogram/types/chat_join_request.py @@ -1795,7 +1795,7 @@ class ChatJoinRequest(TelegramObject): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), @@ -1917,7 +1917,7 @@ class ChatJoinRequest(TelegramObject): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/types/chat_member_updated.py b/aiogram/types/chat_member_updated.py index 889fd575..34cd5c09 100644 --- a/aiogram/types/chat_member_updated.py +++ b/aiogram/types/chat_member_updated.py @@ -936,7 +936,7 @@ class ChatMemberUpdated(TelegramObject): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/types/inaccessible_message.py b/aiogram/types/inaccessible_message.py index 5c9c8325..32262625 100644 --- a/aiogram/types/inaccessible_message.py +++ b/aiogram/types/inaccessible_message.py @@ -1758,7 +1758,7 @@ class InaccessibleMessage(MaybeInaccessibleMessage): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), @@ -1884,7 +1884,7 @@ class InaccessibleMessage(MaybeInaccessibleMessage): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/types/message.py b/aiogram/types/message.py index abd9173b..d2bd7754 100644 --- a/aiogram/types/message.py +++ b/aiogram/types/message.py @@ -2481,7 +2481,7 @@ class Message(MaybeInaccessibleMessage): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), @@ -2601,7 +2601,7 @@ class Message(MaybeInaccessibleMessage): close_date: DateTimeUnion | None = None, is_closed: bool | None = None, description: str | None = None, - description_parse_mode: str | None = None, + description_parse_mode: str | Default | None = Default("parse_mode"), description_entities: list[MessageEntity] | None = None, disable_notification: bool | None = None, protect_content: bool | Default | None = Default("protect_content"), diff --git a/aiogram/types/poll_option.py b/aiogram/types/poll_option.py index 5527c92b..24c23b5f 100644 --- a/aiogram/types/poll_option.py +++ b/aiogram/types/poll_option.py @@ -3,6 +3,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, Any from .base import TelegramObject +from .custom import DateTime if TYPE_CHECKING: from .chat import Chat @@ -29,7 +30,7 @@ class PollOption(TelegramObject): """*Optional*. User who added the option; omitted if the option wasn't added by a user after poll creation""" added_by_chat: Chat | None = None """*Optional*. Chat that added the option; omitted if the option wasn't added by a chat after poll creation""" - addition_date: int | None = None + addition_date: DateTime | None = None """*Optional*. Point in time (Unix timestamp) when the option was added; omitted if the option existed in the original poll""" if TYPE_CHECKING: @@ -45,7 +46,7 @@ class PollOption(TelegramObject): text_entities: list[MessageEntity] | None = None, added_by_user: User | None = None, added_by_chat: Chat | None = None, - addition_date: int | None = None, + addition_date: DateTime | None = None, **__pydantic_kwargs: Any, ) -> None: # DO NOT EDIT MANUALLY!!!