diff --git a/misskaty/plugins/stickers.py b/misskaty/plugins/stickers.py index 16403f2f..147949f6 100644 --- a/misskaty/plugins/stickers.py +++ b/misskaty/plugins/stickers.py @@ -61,26 +61,26 @@ SUPPORTED_TYPES = ["jpeg", "png", "webp"] @app.on_cmd("getsticker") @use_chat_lang() async def getsticker_(self: Client, ctx: Message, strings): - if not ctx.reply_to_message or ctx.reply_to_message.sticker: - await ctx.reply_msg(strings("not_sticker")) - else: - sticker = ctx.reply_to_message.sticker - if sticker.is_animated: - await ctx.reply_msg(strings("no_anim_stick")) - else: - with tempfile.TemporaryDirectory() as tempdir: - path = os.path.join(tempdir, "getsticker") - sticker_file = await self.download_media( - message=ctx.reply_to_message, - file_name=f"{path}/{sticker.set_name}.png", - ) - await ctx.reply_to_message.reply_document( - document=sticker_file, - caption=f"Emoji: {sticker.emoji}\n" - f"Sticker ID: {sticker.file_id}\n\n" - f"Send by: @{self.me.username}", - ) - shutil.rmtree(tempdir, ignore_errors=True) + if not ctx.reply_to_message: + return await ctx.reply_msg(strings("not_sticker")) + sticker = ctx.reply_to_message.sticker + if not sticker: + return await ctx.reply_msg("Only support sticker..") + if sticker.is_animated: + return await ctx.reply_msg(strings("no_anim_stick")) + with tempfile.TemporaryDirectory() as tempdir: + path = os.path.join(tempdir, "getsticker") + sticker_file = await self.download_media( + message=ctx.reply_to_message, + file_name=f"{path}/{sticker.set_name}.png", + ) + await ctx.reply_to_message.reply_document( + document=sticker_file, + caption=f"Emoji: {sticker.emoji}\n" + f"Sticker ID: {sticker.file_id}\n\n" + f"Send by: @{self.me.username}", + ) + shutil.rmtree(tempdir, ignore_errors=True) @app.on_message(filters.command("stickerid", COMMAND_HANDLER) & filters.reply) diff --git a/misskaty/plugins/ytdl_plugins.py b/misskaty/plugins/ytdl_plugins.py index 9f5a35d8..23536c11 100644 --- a/misskaty/plugins/ytdl_plugins.py +++ b/misskaty/plugins/ytdl_plugins.py @@ -96,8 +96,7 @@ async def ytdownv2(self, ctx: Message, strings): return await ctx.reply_msg(strings("no_channel")) if ctx.command and len(ctx.command) == 1: return await ctx.reply_msg(strings("invalid_link")) - msg = ctx.caption if ctx.web_page_preview else ctx.text - url = msg.split()[1] + url = ctx.command[1] if ctx.command and len(ctx.command) > 1 else ctx.text if not isValidURL(url): return await ctx.reply_msg(strings("invalid_link")) async with iYTDL(log_group_id=0, cache_path="cache", silent=True) as ytdl: