From 4d12e073ee49c3aa89c9ad2284e2eb70e0817705 Mon Sep 17 00:00:00 2001 From: Forden <24463229+Forden@users.noreply.github.com> Date: Sun, 13 Aug 2023 18:05:04 +0300 Subject: [PATCH] Fix missing message content types (#1252) * Fix missing message content types * Added changelog * Fix black * Update CHANGES/1252.bugfix.rst Co-authored-by: Alex Root Junior * add tests --------- Co-authored-by: Alex Root Junior --- CHANGES/1252.bugfix.rst | 1 + aiogram/types/message.py | 4 ++++ tests/test_api/test_types/test_message.py | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+) create mode 100644 CHANGES/1252.bugfix.rst diff --git a/CHANGES/1252.bugfix.rst b/CHANGES/1252.bugfix.rst new file mode 100644 index 00000000..640f9228 --- /dev/null +++ b/CHANGES/1252.bugfix.rst @@ -0,0 +1 @@ +Fixed missing message content types (:code:`ContentType.USER_SHARED`, :code:`ContentType.CHAT_SHARED`) diff --git a/aiogram/types/message.py b/aiogram/types/message.py index 610f162c..c8fd7c5a 100644 --- a/aiogram/types/message.py +++ b/aiogram/types/message.py @@ -492,6 +492,10 @@ class Message(TelegramObject): return ContentType.VIDEO_CHAT_PARTICIPANTS_INVITED if self.web_app_data: return ContentType.WEB_APP_DATA + if self.user_shared: + return ContentType.USER_SHARED + if self.chat_shared: + return ContentType.CHAT_SHARED return ContentType.UNKNOWN diff --git a/tests/test_api/test_types/test_message.py b/tests/test_api/test_types/test_message.py index 1b15327f..f0a34b09 100644 --- a/tests/test_api/test_types/test_message.py +++ b/tests/test_api/test_types/test_message.py @@ -38,6 +38,7 @@ from aiogram.types import ( Animation, Audio, Chat, + ChatShared, Contact, Dice, Document, @@ -62,6 +63,7 @@ from aiogram.types import ( Sticker, SuccessfulPayment, User, + UserShared, Venue, Video, VideoChatEnded, @@ -439,6 +441,20 @@ TEST_FORUM_TOPIC_REOPENED = Message( from_user=User(id=42, is_bot=False, first_name="Test"), forum_topic_reopened=ForumTopicReopened(), ) +TEST_USER_SHARED = Message( + message_id=42, + date=datetime.datetime.now(), + chat=Chat(id=42, type="private"), + from_user=User(id=42, is_bot=False, first_name="Test"), + user_shared=UserShared(request_id=42, user_id=42), +) +TEST_CHAT_SHARED = Message( + message_id=42, + date=datetime.datetime.now(), + chat=Chat(id=42, type="private"), + from_user=User(id=42, is_bot=False, first_name="Test"), + chat_shared=ChatShared(request_id=42, chat_id=42), +) TEST_MESSAGE_UNKNOWN = Message( message_id=42, date=datetime.datetime.now(), @@ -498,6 +514,8 @@ class TestMessage: [TEST_FORUM_TOPIC_EDITED, ContentType.FORUM_TOPIC_EDITED], [TEST_FORUM_TOPIC_CLOSED, ContentType.FORUM_TOPIC_CLOSED], [TEST_FORUM_TOPIC_REOPENED, ContentType.FORUM_TOPIC_REOPENED], + [TEST_USER_SHARED, ContentType.USER_SHARED], + [TEST_CHAT_SHARED, ContentType.CHAT_SHARED], [TEST_MESSAGE_UNKNOWN, ContentType.UNKNOWN], ], ) @@ -642,6 +660,8 @@ class TestMessage: [TEST_MESSAGE_VIDEO_CHAT_ENDED, None], [TEST_MESSAGE_VIDEO_CHAT_PARTICIPANTS_INVITED, None], [TEST_MESSAGE_DICE, SendDice], + [TEST_USER_SHARED, None], + [TEST_CHAT_SHARED, None], [TEST_MESSAGE_UNKNOWN, None], ], )