diff --git a/docs/source/pyrogram/Types.rst b/docs/source/pyrogram/Types.rst index 4fe01873..39335ee2 100644 --- a/docs/source/pyrogram/Types.rst +++ b/docs/source/pyrogram/Types.rst @@ -66,6 +66,7 @@ Input Media .. autosummary:: :nosignatures: + InputMedia InputMediaPhoto InputMediaVideo InputMediaAudio @@ -215,6 +216,9 @@ InputMessageContent .. Input Media ----------- +.. autoclass:: InputMedia + :members: + .. autoclass:: InputMediaPhoto :members: diff --git a/pyrogram/__init__.py b/pyrogram/__init__.py index d8f96c66..4b155c65 100644 --- a/pyrogram/__init__.py +++ b/pyrogram/__init__.py @@ -33,7 +33,7 @@ __version__ = "0.12.0.develop" from .api.errors import Error from .client.types import ( - Audio, Chat, ChatMember, ChatMembers, ChatPhoto, Contact, Document, InputMediaPhoto, + Audio, Chat, ChatMember, ChatMembers, ChatPhoto, Contact, Document, InputMedia, InputMediaPhoto, InputMediaVideo, InputMediaDocument, InputMediaAudio, InputMediaAnimation, InputPhoneContact, Location, Message, MessageEntity, Dialog, Dialogs, Photo, PhotoSize, Sticker, User, UserStatus, UserProfilePhotos, Venue, Animation, Video, VideoNote, Voice, CallbackQuery, Messages, ForceReply, diff --git a/pyrogram/client/methods/messages/edit_message_media.py b/pyrogram/client/methods/messages/edit_message_media.py index cbb00aa3..57600ead 100644 --- a/pyrogram/client/methods/messages/edit_message_media.py +++ b/pyrogram/client/methods/messages/edit_message_media.py @@ -56,7 +56,7 @@ class EditMessageMedia(BaseClient): message_id (``int``): Message identifier in the chat specified in chat_id. - media (:obj:`InputMediaAnimation` | :obj:`InputMediaAudio` | :obj:`InputMediaDocument` | :obj:`InputMediaPhoto` | :obj:`InputMediaVideo`) + media (:obj:`InputMedia`) One of the InputMedia objects describing an animation, audio, document, photo or video. reply_markup (:obj:`InlineKeyboardMarkup`, *optional*): diff --git a/pyrogram/client/methods/messages/send_media_group.py b/pyrogram/client/methods/messages/send_media_group.py index aff0a29f..a546e114 100644 --- a/pyrogram/client/methods/messages/send_media_group.py +++ b/pyrogram/client/methods/messages/send_media_group.py @@ -49,10 +49,8 @@ class SendMediaGroup(BaseClient): For your personal cloud (Saved Messages) you can simply use "me" or "self". For a contact that exists in your Telegram address book you can use his phone number (str). - media (``list``): - A list containing either :obj:`InputMediaPhoto ` or - :obj:`InputMediaVideo ` objects - describing photos and videos to be sent, must include 2–10 items. + media (List of :obj:`InputMediaPhoto` and :obj:`InputMediaVideo`): + A list describing photos and videos to be sent, must include 2–10 items. disable_notification (``bool``, *optional*): Sends the message silently. diff --git a/pyrogram/client/types/__init__.py b/pyrogram/client/types/__init__.py index e51a8413..c70ec83f 100644 --- a/pyrogram/client/types/__init__.py +++ b/pyrogram/client/types/__init__.py @@ -25,7 +25,7 @@ from .inline_mode import ( InlineQuery, InlineQueryResult, InlineQueryResultArticle ) from .input_media import ( - InputMediaAudio, InputPhoneContact, InputMediaVideo, InputMediaPhoto, + InputMedia, InputMediaAudio, InputPhoneContact, InputMediaVideo, InputMediaPhoto, InputMediaDocument, InputMediaAnimation ) from .input_message_content import (