mirror of
https://github.com/pyrogram/pyrogram
synced 2025-08-28 21:07:59 +00:00
Fixed edit_inline_media once again (#1052)
Co-authored-by: Dan <14043624+delivrance@users.noreply.github.com>
This commit is contained in:
Davide Galilei
GitHub
parent
bc9161c354
commit
e1923508f6
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
import io
|
||||||
import asyncio
|
import asyncio
|
||||||
import io
|
import io
|
||||||
|
|
||||||
@ -77,21 +78,41 @@ class EditInlineMedia:
|
|||||||
caption = media.caption
|
caption = media.caption
|
||||||
parse_mode = media.parse_mode
|
parse_mode = media.parse_mode
|
||||||
|
|
||||||
if isinstance(media, types.InputMediaPhoto):
|
is_photo = isinstance(media, types.InputMediaPhoto)
|
||||||
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
|
|
||||||
|
is_bytes_io = isinstance(media.media, io.BytesIO)
|
||||||
|
is_uploaded_file = is_bytes_io or os.path.isfile(media.media)
|
||||||
|
|
||||||
|
is_external_url = not is_uploaded_file and re.match("^https?://", media.media)
|
||||||
|
|
||||||
|
if is_bytes_io and not hasattr(media.media, "name"):
|
||||||
|
media.media.name = "media"
|
||||||
|
|
||||||
|
if is_uploaded_file:
|
||||||
|
filename_attribute = [
|
||||||
|
raw.types.DocumentAttributeFilename(
|
||||||
|
file_name=media.media.name if is_bytes_io else os.path.basename(media.media)
|
||||||
|
)
|
||||||
|
]
|
||||||
|
else:
|
||||||
|
filename_attribute = []
|
||||||
|
|
||||||
|
|
||||||
|
if is_photo:
|
||||||
|
if is_uploaded_file:
|
||||||
media = raw.types.InputMediaUploadedPhoto(
|
media = raw.types.InputMediaUploadedPhoto(
|
||||||
file=await self.save_file(media.media)
|
file=await self.save_file(media.media)
|
||||||
)
|
)
|
||||||
elif re.match("^https?://", media.media):
|
elif is_external_url:
|
||||||
media = raw.types.InputMediaPhotoExternal(
|
media = raw.types.InputMediaPhotoExternal(
|
||||||
url=media.media
|
url=media.media
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
media = utils.get_input_media_from_file_id(media.media, FileType.PHOTO)
|
media = utils.get_input_media_from_file_id(media.media, FileType.PHOTO)
|
||||||
elif isinstance(media, types.InputMediaVideo):
|
elif isinstance(media, types.InputMediaVideo):
|
||||||
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
|
if is_uploaded_file:
|
||||||
media = raw.types.InputMediaUploadedDocument(
|
media = raw.types.InputMediaUploadedDocument(
|
||||||
mime_type=self.guess_mime_type(media.media) or "video/mp4",
|
mime_type=(None if is_bytes_io else self.guess_mime_type(media.media)) or "video/mp4",
|
||||||
thumb=await self.save_file(media.thumb),
|
thumb=await self.save_file(media.thumb),
|
||||||
file=await self.save_file(media.media),
|
file=await self.save_file(media.media),
|
||||||
attributes=[
|
attributes=[
|
||||||
@ -100,22 +121,19 @@ class EditInlineMedia:
|
|||||||
duration=media.duration,
|
duration=media.duration,
|
||||||
w=media.width,
|
w=media.width,
|
||||||
h=media.height
|
h=media.height
|
||||||
),
|
|
||||||
raw.types.DocumentAttributeFilename(
|
|
||||||
file_name=os.path.basename(media.media)
|
|
||||||
)
|
)
|
||||||
]
|
] + filename_attribute
|
||||||
)
|
)
|
||||||
elif re.match("^https?://", media.media):
|
elif is_external_url:
|
||||||
media = raw.types.InputMediaDocumentExternal(
|
media = raw.types.InputMediaDocumentExternal(
|
||||||
url=media.media
|
url=media.media
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
media = utils.get_input_media_from_file_id(media.media, FileType.VIDEO)
|
media = utils.get_input_media_from_file_id(media.media, FileType.VIDEO)
|
||||||
elif isinstance(media, types.InputMediaAudio):
|
elif isinstance(media, types.InputMediaAudio):
|
||||||
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
|
if is_uploaded_file:
|
||||||
media = raw.types.InputMediaUploadedDocument(
|
media = raw.types.InputMediaUploadedDocument(
|
||||||
mime_type=self.guess_mime_type(media.media) or "audio/mpeg",
|
mime_type=(None if is_bytes_io else self.guess_mime_type(media.media)) or "audio/mpeg",
|
||||||
thumb=await self.save_file(media.thumb),
|
thumb=await self.save_file(media.thumb),
|
||||||
file=await self.save_file(media.media),
|
file=await self.save_file(media.media),
|
||||||
attributes=[
|
attributes=[
|
||||||
@ -123,22 +141,19 @@ class EditInlineMedia:
|
|||||||
duration=media.duration,
|
duration=media.duration,
|
||||||
performer=media.performer,
|
performer=media.performer,
|
||||||
title=media.title
|
title=media.title
|
||||||
),
|
|
||||||
raw.types.DocumentAttributeFilename(
|
|
||||||
file_name=os.path.basename(media.media)
|
|
||||||
)
|
)
|
||||||
]
|
] + filename_attribute
|
||||||
)
|
)
|
||||||
elif re.match("^https?://", media.media):
|
elif is_external_url:
|
||||||
media = raw.types.InputMediaDocumentExternal(
|
media = raw.types.InputMediaDocumentExternal(
|
||||||
url=media.media
|
url=media.media
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
media = utils.get_input_media_from_file_id(media.media, FileType.AUDIO)
|
media = utils.get_input_media_from_file_id(media.media, FileType.AUDIO)
|
||||||
elif isinstance(media, types.InputMediaAnimation):
|
elif isinstance(media, types.InputMediaAnimation):
|
||||||
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
|
if is_uploaded_file:
|
||||||
media = raw.types.InputMediaUploadedDocument(
|
media = raw.types.InputMediaUploadedDocument(
|
||||||
mime_type=self.guess_mime_type(media.media) or "video/mp4",
|
mime_type=(None if is_bytes_io else self.guess_mime_type(media.media)) or "video/mp4",
|
||||||
thumb=await self.save_file(media.thumb),
|
thumb=await self.save_file(media.thumb),
|
||||||
file=await self.save_file(media.media),
|
file=await self.save_file(media.media),
|
||||||
attributes=[
|
attributes=[
|
||||||
@ -148,33 +163,26 @@ class EditInlineMedia:
|
|||||||
w=media.width,
|
w=media.width,
|
||||||
h=media.height
|
h=media.height
|
||||||
),
|
),
|
||||||
raw.types.DocumentAttributeFilename(
|
|
||||||
file_name=os.path.basename(media.media)
|
|
||||||
),
|
|
||||||
raw.types.DocumentAttributeAnimated()
|
raw.types.DocumentAttributeAnimated()
|
||||||
],
|
] + filename_attribute,
|
||||||
nosound_video=True
|
nosound_video=True
|
||||||
)
|
)
|
||||||
elif re.match("^https?://", media.media):
|
elif is_external_url:
|
||||||
media = raw.types.InputMediaDocumentExternal(
|
media = raw.types.InputMediaDocumentExternal(
|
||||||
url=media.media
|
url=media.media
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
media = utils.get_input_media_from_file_id(media.media, FileType.ANIMATION)
|
media = utils.get_input_media_from_file_id(media.media, FileType.ANIMATION)
|
||||||
elif isinstance(media, types.InputMediaDocument):
|
elif isinstance(media, types.InputMediaDocument):
|
||||||
if isinstance(media.media, io.BytesIO) or os.path.isfile(media.media):
|
if is_uploaded_file:
|
||||||
media = raw.types.InputMediaUploadedDocument(
|
media = raw.types.InputMediaUploadedDocument(
|
||||||
mime_type=self.guess_mime_type(media.media) or "application/zip",
|
mime_type=(None if is_bytes_io else self.guess_mime_type(media.media)) or "application/zip",
|
||||||
thumb=await self.save_file(media.thumb),
|
thumb=await self.save_file(media.thumb),
|
||||||
file=await self.save_file(media.media),
|
file=await self.save_file(media.media),
|
||||||
attributes=[
|
attributes=filename_attribute,
|
||||||
raw.types.DocumentAttributeFilename(
|
|
||||||
file_name=os.path.basename(media.media)
|
|
||||||
)
|
|
||||||
],
|
|
||||||
force_file=True
|
force_file=True
|
||||||
)
|
)
|
||||||
elif re.match("^https?://", media.media):
|
elif is_external_url:
|
||||||
media = raw.types.InputMediaDocumentExternal(
|
media = raw.types.InputMediaDocumentExternal(
|
||||||
url=media.media
|
url=media.media
|
||||||
)
|
)
|
||||||
@ -186,25 +194,37 @@ class EditInlineMedia:
|
|||||||
|
|
||||||
session = await get_session(self, dc_id)
|
session = await get_session(self, dc_id)
|
||||||
|
|
||||||
actual_media = await self.invoke(
|
|
||||||
raw.functions.messages.UploadMedia(
|
if is_uploaded_file:
|
||||||
peer=raw.types.InputPeerSelf(),
|
uploaded_media = await self.invoke(
|
||||||
media=media
|
raw.functions.messages.UploadMedia(
|
||||||
|
peer=raw.types.InputPeerSelf(),
|
||||||
|
media=media
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
actual_media = raw.types.InputMediaPhoto(
|
||||||
|
id=raw.types.InputPhoto(
|
||||||
|
id=uploaded_media.photo.id,
|
||||||
|
access_hash=uploaded_media.photo.access_hash,
|
||||||
|
file_reference=uploaded_media.photo.file_reference
|
||||||
|
)
|
||||||
|
) if is_photo else raw.types.InputMediaDocument(
|
||||||
|
id=raw.types.InputDocument(
|
||||||
|
id=uploaded_media.document.id,
|
||||||
|
access_hash=uploaded_media.document.access_hash,
|
||||||
|
file_reference=uploaded_media.document.file_reference
|
||||||
|
)
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
actual_media = media
|
||||||
|
|
||||||
for i in range(self.MAX_RETRIES):
|
for i in range(self.MAX_RETRIES):
|
||||||
try:
|
try:
|
||||||
return await session.invoke(
|
return await session.invoke(
|
||||||
raw.functions.messages.EditInlineBotMessage(
|
raw.functions.messages.EditInlineBotMessage(
|
||||||
id=unpacked,
|
id=unpacked,
|
||||||
media=raw.types.InputMediaDocument(
|
media=actual_media,
|
||||||
id=raw.types.InputDocument(
|
|
||||||
id=actual_media.document.id,
|
|
||||||
access_hash=actual_media.document.access_hash,
|
|
||||||
file_reference=actual_media.document.file_reference
|
|
||||||
)
|
|
||||||
),
|
|
||||||
reply_markup=await reply_markup.write(self) if reply_markup else None,
|
reply_markup=await reply_markup.write(self) if reply_markup else None,
|
||||||
**await self.parser.parse(caption, parse_mode)
|
**await self.parser.parse(caption, parse_mode)
|
||||||
),
|
),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user