diff --git a/README.md b/README.md index 63fa7b3..7610669 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ | general | `help`, `botinfo`, `serverinfo`, `ping`, `feedback`, `uptime` | | fun | `randomfact`, `coinflip`, `rps`, `8ball`, `minesweeper` | | moderation | `kick`, `ban`, `nick`, `purge`, `hackban`, `warnings`, `archive` | +| media | `download` | | sidestore | `sidestore`, `refresh`, `code`, `crash`, `pairing`, `server`, `half`, `sparse`, `afc`, `udid` | | idevice | `idevice`, `noapps`, `errorcode`, `developermode`, `mountddi` | | miscellaneous | `keanu`, `labubu`, `piracy`, `tryitandsee`, `rickroll`, `dontasktoask`, `support`| diff --git a/TODO.md b/TODO.md index df4ebfa..eede641 100644 --- a/TODO.md +++ b/TODO.md @@ -6,6 +6,12 @@ - [x] Add rest of the errors yikes - [x] Add ddi mounting command +- [ ] Add melonx commands + +- [ ] Add ai commands + +- [ ] Add leaderboard command + - [ ] Add unit tests - [ ] Add documentation to readme diff --git a/cogs/help.py b/cogs/help.py index fe3026c..d86e651 100644 --- a/cogs/help.py +++ b/cogs/help.py @@ -13,7 +13,7 @@ class Help(commands.Cog, name="help"): interaction: discord.Interaction, current: str, ) -> list[app_commands.Choice[str]]: - categories = ["general", "fun", "moderation", "owner", "sidestore", "idevice", "miscellaneous", "utilities"] + categories = ["general", "fun", "moderation", "owner", "sidestore", "idevice", "media", "miscellaneous", "utilities"] suggestions = [] for category in categories: @@ -40,6 +40,7 @@ class Help(commands.Cog, name="help"): "general": "general", "fun": "fun", "idevice": "idevice", + "media": "media", "misc": "miscellaneous", "miscellaneous": "miscellaneous", "moderation": "moderation", @@ -64,6 +65,7 @@ class Help(commands.Cog, name="help"): "owner": "Owner commands", "sidestore": "SideStore troubleshooting commands", "idevice": "idevice troubleshooting commands", + "media": "Media commands", "utilities": "Utility commands", "miscellaneous": "Miscellaneous commands" } diff --git a/cogs/media/__init__.py b/cogs/media/__init__.py new file mode 100644 index 0000000..cfc3783 --- /dev/null +++ b/cogs/media/__init__.py @@ -0,0 +1,57 @@ +import discord +from discord.ext import commands +from discord.ext.commands import Context + +from .download import download_command + + +def _require_group_prefix(context: Context) -> bool: + if getattr(context, "interaction", None): + return True + group = getattr(getattr(context, "cog", None), "qualified_name", "").lower() + if not group: + return True + prefix = context.prefix or "" + content = context.message.content.strip().lower() + return content.startswith(f"{prefix}{group} ") + +class Media(commands.GroupCog, name="media"): + def __init__(self, bot) -> None: + self.bot = bot + super().__init__() + + @commands.group(name="media", invoke_without_command=True) + async def media_group(self, context: Context): + embed = discord.Embed( + title="Media Commands", + description="Use `.media ` or `/media `.", + color=0x7289DA + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + embed.add_field(name="Available", value="download", inline=False) + await context.send(embed=embed) + + async def _invoke_hybrid(self, context: Context, name: str): + command = self.bot.get_command(name) + if command is not None: + await context.invoke(command) + else: + await context.send(f"Unknown media command: {name}") + + @media_group.command(name="download") + async def media_group_download(self, context: Context, *, url: str): + await self._invoke_hybrid(context, "download", url=url) + + @commands.check(_require_group_prefix) + @commands.hybrid_command( + name="download", + description="Download a video from a URL using yt-dlp.", + ) + async def download(self, context, *, url: str): + return await download_command()(self, context, url=url) + +async def setup(bot) -> None: + cog = Media(bot) + await bot.add_cog(cog) + + bot.logger.info("Loaded extension 'media.download'") diff --git a/cogs/media/download.py b/cogs/media/download.py new file mode 100644 index 0000000..cad1e66 --- /dev/null +++ b/cogs/media/download.py @@ -0,0 +1,266 @@ +import asyncio +import os +import tempfile +import discord +from discord.ext import commands +import yt_dlp +from urllib.parse import urlparse +import aiohttp +import logging + +logger = logging.getLogger("discord_bot") + +def download_command(): + @commands.hybrid_command( + name="download", + description="Download a video from a URL using yt-dlp.", + ) + @commands.cooldown(1, 30, commands.BucketType.user) + async def download(self, context, *, url: str): + if not url: + embed = discord.Embed( + title="Error", + description="Please provide a valid URL to download.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + + try: + parsed_url = urlparse(url) + if not parsed_url.scheme or not parsed_url.netloc: + embed = discord.Embed( + title="Error", + description="Please provide a valid URL.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + except Exception: + embed = discord.Embed( + title="Error", + description="Please provide a valid URL.", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=embed, ephemeral=True) + else: + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await context.send(embed=embed, ephemeral=True) + return + + processing_embed = discord.Embed( + title="Download (Processing)", + description="Downloading video... This may take a moment.", + color=0x7289DA, + ) + processing_embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + interaction = getattr(context, "interaction", None) + if interaction is not None: + if not interaction.response.is_done(): + await interaction.response.send_message(embed=processing_embed, ephemeral=True) + else: + await interaction.followup.send(embed=processing_embed, ephemeral=True) + else: + processing_msg = await context.send(embed=processing_embed) + + temp_dir = tempfile.mkdtemp() + + ydl_opts = { + 'format': 'bestvideo[filesize<200M]+bestaudio[filesize<200M]/best[filesize<200M]/bestvideo+bestaudio/best', + 'outtmpl': os.path.join(temp_dir, '%(title)s.%(ext)s'), + 'noplaylist': True, + 'extract_flat': False, + 'writesubtitles': False, + 'writeautomaticsub': False, + 'writethumbnail': False, + 'ignoreerrors': False, + 'merge_output_format': 'mp4', + } + + try: + with yt_dlp.YoutubeDL(ydl_opts) as ydl: + info = await asyncio.get_event_loop().run_in_executor( + None, lambda: ydl.extract_info(url, download=True) + ) + + if not info: + raise Exception("Could not extract video information") + + video_title = info.get('title', 'Unknown Title') + video_duration_seconds = int(info.get('duration') or 0) + video_uploader = info.get('uploader', 'Unknown') + video_url = info.get('webpage_url') or info.get('original_url') or url + platform = info.get('extractor') or info.get('extractor_key') or 'Unknown' + view_count = info.get('view_count') + + files = [f for f in os.listdir(temp_dir) if os.path.isfile(os.path.join(temp_dir, f))] + + if not files: + raise Exception("No video file was downloaded") + + video_file = os.path.join(temp_dir, files[0]) + file_size = os.path.getsize(video_file) + + if file_size > 25 * 1024 * 1024: + async def upload_to_catbox(path: str) -> str: + try: + file_size_bytes = os.path.getsize(path) + except Exception: + file_size_bytes = -1 + logger.info(f"Catbox upload start: name={os.path.basename(path)} size={file_size_bytes}") + form = aiohttp.FormData() + form.add_field('reqtype', 'fileupload') + form.add_field('fileToUpload', open(path, 'rb'), filename=os.path.basename(path)) + timeout = aiohttp.ClientTimeout(total=600) + async with aiohttp.ClientSession(timeout=timeout) as session: + async with session.post('https://catbox.moe/user/api.php', data=form) as resp: + text = await resp.text() + logger.info(f"Catbox response: status={resp.status} body_len={len(text)}") + if resp.status == 200 and text.startswith('https://'): + url_text = text.strip() + logger.info(f"Catbox upload success: url={url_text}") + return url_text + logger.error(f"Catbox upload failed: status={resp.status} body={text.strip()[:500]}") + raise RuntimeError(f"Upload failed: {text.strip()}") + + try: + link = await upload_to_catbox(video_file) + minutes, seconds = divmod(video_duration_seconds, 60) + duration_str = f"{minutes}:{seconds:02d}" + description_text = f"### **[{video_title}]({video_url})**" if video_url else f"### **{video_title}**" + embed = discord.Embed( + title="Download", + description=description_text, + color=0x7289DA, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + embed.add_field(name="Uploader", value=video_uploader or "Unknown", inline=True) + embed.add_field(name="Duration", value=duration_str, inline=True) + embed.add_field(name="Platform", value=platform, inline=True) + embed.set_footer(text=f"Requested by {context.author.name}", icon_url=context.author.display_avatar.url) + + if interaction is not None: + await context.channel.send(embed=embed) + await context.channel.send(link) + try: + await interaction.delete_original_response() + except: + pass + else: + await processing_msg.delete() + await context.channel.send(embed=embed) + await context.channel.send(link) + return + except Exception as upload_error: + logger.exception(f"Catbox upload exception: {upload_error}") + error_msg = str(upload_error) + if "greater than 200mb" in error_msg.lower(): + description = "The video is too large to upload. The file exceeds 200MB (Catbox limit) and cannot be sent via Discord (25MB limit)." + else: + description = f"The video is over 25MB and upload to hosting failed: {upload_error}" + + embed = discord.Embed( + title="Error", + description=description, + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + if interaction is not None: + try: + await interaction.delete_original_response() + except: + pass + await interaction.followup.send(embed=embed, ephemeral=True) + else: + await processing_msg.delete() + await context.send(embed=embed, ephemeral=True) + return + + minutes, seconds = divmod(video_duration_seconds, 60) + duration_str = f"{minutes}:{seconds:02d}" + description_text = f"### **[{video_title}]({video_url})**" if video_url else f"### **{video_title}**" + embed = discord.Embed( + title="Download", + description=description_text, + color=0x7289DA, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + embed.add_field(name="Uploader", value=video_uploader or "Unknown", inline=True) + embed.add_field(name="Duration", value=duration_str, inline=True) + embed.add_field(name="Platform", value=platform, inline=True) + embed.set_footer(text=f"Requested by {context.author.name}", icon_url=context.author.display_avatar.url) + + with open(video_file, 'rb') as f: + file = discord.File(f, filename=files[0]) + + if interaction is not None: + await context.channel.send(embed=embed) + await context.channel.send(file=file) + try: + await interaction.delete_original_response() + except: + pass + else: + await processing_msg.delete() + await context.channel.send(embed=embed) + await context.channel.send(file=file) + + except Exception as e: + embed = discord.Embed( + title="Error", + description=f"Failed to download video: {str(e)}", + color=0xE02B2B, + ) + embed.set_author(name="Media", icon_url="https://yes.nighty.works/raw/y5SEZ9.webp") + + if interaction is not None: + try: + await interaction.delete_original_response() + except: + pass + await interaction.followup.send(embed=embed, ephemeral=True) + else: + try: + await processing_msg.delete() + except: + pass + await context.send(embed=embed, ephemeral=True) + + finally: + for file in os.listdir(temp_dir): + try: + os.remove(os.path.join(temp_dir, file)) + except: + pass + try: + os.rmdir(temp_dir) + except: + pass + + return download \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 2eda723..7e731e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ aiohttp aiosqlite discord.py==2.6.3 -python-dotenv \ No newline at end of file +python-dotenv +yt-dlp \ No newline at end of file