From 264a206a139ab6fdaf166df9eb36c0cdfabb4faf Mon Sep 17 00:00:00 2001 From: Dan <14043624+delivrance@users.noreply.github.com> Date: Sun, 24 Apr 2022 11:56:07 +0200 Subject: [PATCH] Rename enum MessageMedia to MessageMediaType --- docs/source/api/enums/MessageMedia.rst | 8 ----- docs/source/api/enums/MessageMediaType.rst | 8 +++++ docs/source/api/enums/index.rst | 4 +-- pyrogram/enums/__init__.py | 2 +- ...message_media.py => message_media_type.py} | 4 +-- pyrogram/types/messages_and_media/message.py | 32 +++++++++---------- 6 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 docs/source/api/enums/MessageMedia.rst create mode 100644 docs/source/api/enums/MessageMediaType.rst rename pyrogram/enums/{message_media.py => message_media_type.py} (92%) diff --git a/docs/source/api/enums/MessageMedia.rst b/docs/source/api/enums/MessageMedia.rst deleted file mode 100644 index f42693f0..00000000 --- a/docs/source/api/enums/MessageMedia.rst +++ /dev/null @@ -1,8 +0,0 @@ -MessageMedia -============ - -.. autoclass:: pyrogram.enums.MessageMedia() - :members: - -.. raw:: html - :file: ./cleanup.html \ No newline at end of file diff --git a/docs/source/api/enums/MessageMediaType.rst b/docs/source/api/enums/MessageMediaType.rst new file mode 100644 index 00000000..04e439d2 --- /dev/null +++ b/docs/source/api/enums/MessageMediaType.rst @@ -0,0 +1,8 @@ +MessageMediaType +================ + +.. autoclass:: pyrogram.enums.MessageMediaType() + :members: + +.. raw:: html + :file: ./cleanup.html \ No newline at end of file diff --git a/docs/source/api/enums/index.rst b/docs/source/api/enums/index.rst index 574b4dd7..12b1fac1 100644 --- a/docs/source/api/enums/index.rst +++ b/docs/source/api/enums/index.rst @@ -19,7 +19,7 @@ to apply only a valid value among the expected ones. ChatMembersFilter ChatType MessageEntityType - MessageMedia + MessageMediaType MessageService MessagesFilter ParseMode @@ -37,7 +37,7 @@ to apply only a valid value among the expected ones. ChatMembersFilter ChatType MessageEntityType - MessageMedia + MessageMediaType MessageService MessagesFilter ParseMode diff --git a/pyrogram/enums/__init__.py b/pyrogram/enums/__init__.py index 7d553918..acdc5233 100644 --- a/pyrogram/enums/__init__.py +++ b/pyrogram/enums/__init__.py @@ -22,7 +22,7 @@ from .chat_member_status import ChatMemberStatus from .chat_members_filter import ChatMembersFilter from .chat_type import ChatType from .message_entity_type import MessageEntityType -from .message_media import MessageMedia +from .message_media_type import MessageMediaType from .message_service import MessageService from .messages_filter import MessagesFilter from .next_code_type import NextCodeType diff --git a/pyrogram/enums/message_media.py b/pyrogram/enums/message_media_type.py similarity index 92% rename from pyrogram/enums/message_media.py rename to pyrogram/enums/message_media_type.py index b7dfd03b..58878114 100644 --- a/pyrogram/enums/message_media.py +++ b/pyrogram/enums/message_media_type.py @@ -21,8 +21,8 @@ from enum import auto from .auto_name import AutoName -class MessageMedia(AutoName): - """Message media enumeration used in :obj:`~pyrogram.types.Message`.""" +class MessageMediaType(AutoName): + """Message media type enumeration used in :obj:`~pyrogram.types.Message`.""" AUDIO = auto() "Audio media" diff --git a/pyrogram/types/messages_and_media/message.py b/pyrogram/types/messages_and_media/message.py index 78817f49..9f0cf8a3 100644 --- a/pyrogram/types/messages_and_media/message.py +++ b/pyrogram/types/messages_and_media/message.py @@ -118,7 +118,7 @@ class Message(Object, Update): This field will contain the enumeration type of the service message. You can use ``service = getattr(message, message.service.value)`` to access the service message. - media (:obj:`~pyrogram.enums.MessageMedia`, *optional*): + media (:obj:`~pyrogram.enums.MessageMediaType`, *optional*): The message is a media message. This field will contain the enumeration type of the media message. You can use ``media = getattr(message, message.media.value)`` to access the media message. @@ -657,19 +657,19 @@ class Message(Object, Update): if media: if isinstance(media, raw.types.MessageMediaPhoto): photo = types.Photo._parse(client, media.photo, media.ttl_seconds) - media_type = enums.MessageMedia.PHOTO + media_type = enums.MessageMediaType.PHOTO elif isinstance(media, raw.types.MessageMediaGeo): location = types.Location._parse(client, media.geo) - media_type = enums.MessageMedia.LOCATION + media_type = enums.MessageMediaType.LOCATION elif isinstance(media, raw.types.MessageMediaContact): contact = types.Contact._parse(client, media) - media_type = enums.MessageMedia.CONTACT + media_type = enums.MessageMediaType.CONTACT elif isinstance(media, raw.types.MessageMediaVenue): venue = types.Venue._parse(client, media) - media_type = enums.MessageMedia.VENUE + media_type = enums.MessageMediaType.VENUE elif isinstance(media, raw.types.MessageMediaGame): game = types.Game._parse(client, message) - media_type = enums.MessageMedia.GAME + media_type = enums.MessageMediaType.GAME elif isinstance(media, raw.types.MessageMediaDocument): doc = media.document @@ -687,14 +687,14 @@ class Message(Object, Update): if audio_attributes.voice: voice = types.Voice._parse(client, doc, audio_attributes) - media_type = enums.MessageMedia.VOICE + media_type = enums.MessageMediaType.VOICE else: audio = types.Audio._parse(client, doc, audio_attributes, file_name) - media_type = enums.MessageMedia.AUDIO + media_type = enums.MessageMediaType.AUDIO elif raw.types.DocumentAttributeAnimated in attributes: video_attributes = attributes.get(raw.types.DocumentAttributeVideo, None) animation = types.Animation._parse(client, doc, video_attributes, file_name) - media_type = enums.MessageMedia.ANIMATION + media_type = enums.MessageMediaType.ANIMATION elif raw.types.DocumentAttributeSticker in attributes: sticker = await types.Sticker._parse( client, doc, @@ -702,31 +702,31 @@ class Message(Object, Update): attributes[raw.types.DocumentAttributeSticker], file_name ) - media_type = enums.MessageMedia.STICKER + media_type = enums.MessageMediaType.STICKER elif raw.types.DocumentAttributeVideo in attributes: video_attributes = attributes[raw.types.DocumentAttributeVideo] if video_attributes.round_message: video_note = types.VideoNote._parse(client, doc, video_attributes) - media_type = enums.MessageMedia.VIDEO_NOTE + media_type = enums.MessageMediaType.VIDEO_NOTE else: video = types.Video._parse(client, doc, video_attributes, file_name, media.ttl_seconds) - media_type = enums.MessageMedia.VIDEO + media_type = enums.MessageMediaType.VIDEO else: document = types.Document._parse(client, doc, file_name) - media_type = enums.MessageMedia.DOCUMENT + media_type = enums.MessageMediaType.DOCUMENT elif isinstance(media, raw.types.MessageMediaWebPage): if isinstance(media.webpage, raw.types.WebPage): web_page = types.WebPage._parse(client, media.webpage) - media_type = enums.MessageMedia.WEB_PAGE + media_type = enums.MessageMediaType.WEB_PAGE else: media = None elif isinstance(media, raw.types.MessageMediaPoll): poll = types.Poll._parse(client, media) - media_type = enums.MessageMedia.POLL + media_type = enums.MessageMediaType.POLL elif isinstance(media, raw.types.MessageMediaDice): dice = types.Dice._parse(client, media) - media_type = enums.MessageMedia.DICE + media_type = enums.MessageMediaType.DICE else: media = None