From a6ef59ec4ee68c089ec758a94cb87d4626d72a13 Mon Sep 17 00:00:00 2001 From: yasir Date: Mon, 20 Feb 2023 18:56:47 +0700 Subject: [PATCH] Fix --- misskaty/core/message_utils.py | 4 ++-- misskaty/plugins/inline_search.py | 2 +- misskaty/plugins/ytdl_download_new.py | 17 ++++++++++------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/misskaty/core/message_utils.py b/misskaty/core/message_utils.py index 03f4e66f..2bbbe1fa 100644 --- a/misskaty/core/message_utils.py +++ b/misskaty/core/message_utils.py @@ -1,7 +1,7 @@ import asyncio from logging import getLogger -from pyrogram.errors import ChatWriteForbidden, FloodWait, MessageNotModified, ChatAdminRequired, MessageDeleteForbidden, MessageIdInvalid +from pyrogram.errors import ChatWriteForbidden, FloodWait, MessageNotModified, ChatAdminRequired, MessageDeleteForbidden, MessageIdInvalid, MessageEmpty LOGGER = getLogger(__name__) @@ -32,7 +32,7 @@ async def editPesan(msg, text, **kwargs): LOGGER.warning(str(e)) await asyncio.sleep(e.value) return await editPesan(msg, text, **kwargs) - except (MessageNotModified, MessageIdInvalid): + except (MessageNotModified, MessageIdInvalid, MessageEmpty): return except Exception as e: LOGGER.error(str(e)) diff --git a/misskaty/plugins/inline_search.py b/misskaty/plugins/inline_search.py index c33b5334..85c1d2fa 100644 --- a/misskaty/plugins/inline_search.py +++ b/misskaty/plugins/inline_search.py @@ -127,7 +127,7 @@ async def inline_menu(_, inline_query: InlineQuery): msg += f"{i['name']} ({i['types'][0]})\nRequired: {i['required']}\n{i['description']}\n\n" if len(msg.encode("utf-8")) > 4096: body_text = f""" -
{msg}
+
{msg.replace("", "(user_id)")}
""" msg = await post_to_telegraph(False, method, body_text) datajson.append( diff --git a/misskaty/plugins/ytdl_download_new.py b/misskaty/plugins/ytdl_download_new.py index 7c2f7f4a..ff5cf869 100644 --- a/misskaty/plugins/ytdl_download_new.py +++ b/misskaty/plugins/ytdl_download_new.py @@ -69,13 +69,16 @@ async def ytdownv2(_, message): return await message.reply("Please input a valid YT-DLP Supported URL") url = message.text.split(" ", maxsplit=1)[1] async with iYTDL(log_group_id=0, cache_path="cache", ffmpeg_location="/usr/bin/mediaextract") as ytdl: - x = await ytdl.parse(url) - if x is None: - return await message.reply("Failed parse URL, check logs..") - img = await get_ytthumb(x.key) - caption = x.caption - markup = x.buttons - await message.reply_photo(img, caption=caption, reply_markup=markup, quote=True) + try: + x = await ytdl.parse(url) + if x is None: + return await message.reply("Failed parse URL, check logs..") + img = await get_ytthumb(x.key) + caption = x.caption + markup = x.buttons + await message.reply_photo(img, caption=caption, reply_markup=markup, quote=True) + except Exception as err: + await kirimPesan(message, str(err)) @app.on_callback_query(filters.regex(r"^yt_listall"))