Merge branch 'dev'

Signed-off-by: salmonik <raisersoft@proton.me>

1 files changed, 5 insertions, 15 deletions

diff --git a/cogs/web.py b/cogs/web.py
index b072e99..fd22f9f 100644
--- a/cogs/web.py
+++ b/cogs/web.py
@@ -11,6 +11,7 @@ from bs4 import BeautifulSoup
 import urllib.parse
 import yt_dlp
 import logging
+from cogs.utils.url_helper import clean_url_for_ytdlp
 
 logger = logging.getLogger(__name__)
 
@@ -24,6 +25,7 @@ class Web(commands.Cog):
         if "youtube.com/watch" not in url:
             return None
 
+        url = clean_url_for_ytdlp(url)
         logger.info("youtube link")
         try:
             ydl_opts = {"quiet": True, "nowarnings": True}
@@ -34,18 +36,8 @@ class Web(commands.Cog):
             pass
         return None
 
-    def _create_button(self, index, link):
-        """Create a button for sending search result."""
-        button = discord.ui.Button(label=f"Send Result {index}")
-
-        async def button_callback(interaction: discord.Interaction):
-            await interaction.response.send_message(link.get("href"))
-
-        button.callback = button_callback
-        return button
-
     def _process_search_results(self, links, query):
-        """Process search results and create embed with buttons."""
+        """Process search results and create embed."""
         embed = Embed(title="Search Results", description=f"Top results for: {query}", color=0x1E90FF)
         view = discord.ui.View(disable_on_timeout=True)
 
@@ -56,8 +48,6 @@ class Web(commands.Cog):
                 title = youtube_title
 
             embed.add_field(name=f"Result {i}", value=f"[{title}]({link.get('href')})", inline=False)
-            button = self._create_button(i, link)
-            view.add_item(button)
 
         return embed, view
 
@@ -70,7 +60,7 @@ class Web(commands.Cog):
         ctx: discord.ApplicationContext,
         query: str
     ):
-        await ctx.defer(ephemeral=True)
+        await ctx.defer()
         headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"}
         encoded_query = urllib.parse.quote_plus(query)
         url = f"https://duckduckgo.com/html/?q={encoded_query}"
@@ -92,7 +82,7 @@ class Web(commands.Cog):
             return
 
         embed, view = self._process_search_results(links, query)
-        await ctx.respond(embed=embed, view=view, ephemeral=True)
+        await ctx.respond(embed=embed, view=view)
         logger.info("Search results sent")