mir/pyrogram
2
0
Fork 0
mirror of https://github.com/pyrogram/pyrogram synced 2025-08-28 21:07:59 +00:00
Code Issues Releases Wiki Activity

Improve edit_inline_media (#1036)

Browse Source
This commit is contained in:
Davide Galilei 2022-07-14 20:21:34 +02:00 committed by GitHub
parent 3aaf35792f
commit 4398cbb561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pyrogram/methods/messages/edit_inline_media.py
View File

@ -18,16 +18,20 @@
import os import os
import re import re
import asyncio
import pyrogram import pyrogram
from pyrogram import raw from pyrogram import raw
from pyrogram import types from pyrogram import types
from pyrogram import utils from pyrogram import utils
from pyrogram.errors import RPCError, MediaEmpty
from pyrogram.file_id import FileType from pyrogram.file_id import FileType
from .inline_session import get_session from .inline_session import get_session
class EditInlineMedia: class EditInlineMedia:
MAX_RETRIES = 3
async def edit_inline_media( async def edit_inline_media(
self: "pyrogram.Client", self: "pyrogram.Client",
inline_message_id: str, inline_message_id: str,
@ -147,7 +151,8 @@ class EditInlineMedia:
file_name=os.path.basename(media.media) file_name=os.path.basename(media.media)
), ),
raw.types.DocumentAttributeAnimated() raw.types.DocumentAttributeAnimated()
] ],
nosound_video=True
) )
elif re.match("^https?://", media.media): elif re.match("^https?://", media.media):
media = raw.types.InputMediaDocumentExternal( media = raw.types.InputMediaDocumentExternal(
@ -165,7 +170,8 @@ class EditInlineMedia:
raw.types.DocumentAttributeFilename( raw.types.DocumentAttributeFilename(
file_name=os.path.basename(media.media) file_name=os.path.basename(media.media)
) )
] ],
force_file=True
) )
elif re.match("^https?://", media.media): elif re.match("^https?://", media.media):
media = raw.types.InputMediaDocumentExternal( media = raw.types.InputMediaDocumentExternal(
@ -179,12 +185,34 @@ class EditInlineMedia:
session = await get_session(self, dc_id) session = await get_session(self, dc_id)
return await session.invoke( actual_media = await self.invoke(
raw.functions.messages.EditInlineBotMessage( raw.functions.messages.UploadMedia(
id=unpacked, peer=raw.types.InputPeerSelf(),
media=media, media=media
reply_markup=await reply_markup.write(self) if reply_markup else None, )
**await self.parser.parse(caption, parse_mode)
),
sleep_threshold=self.sleep_threshold
) )
for i in range(self.MAX_RETRIES):
try:
return await session.invoke(
raw.functions.messages.EditInlineBotMessage(
id=unpacked,
media=raw.types.InputMediaDocument(
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,
**await self.parser.parse(caption, parse_mode)
),
sleep_threshold=self.sleep_threshold
)
except RPCError as e:
if i == self.MAX_RETRIES - 1:
raise
if isinstance(e, MediaEmpty):
# Must wait due to a server race condition
await asyncio.sleep(1)

4
pyrogram/methods/messages/inline_session.py
View File

@ -33,8 +33,8 @@ async def get_session(client: "pyrogram.Client", dc_id: int):
session = client.media_sessions[dc_id] = Session( session = client.media_sessions[dc_id] = Session(
client, dc_id, client, dc_id,
await Auth(client, dc_id, False).create(), await Auth(client, dc_id, await client.storage.test_mode()).create(),
False, is_media=True await client.storage.test_mode(), is_media=True
) )
await session.start() await session.start()