added new api for lyrics

vibr/bot.py

@@ -6,7 +6,7 @@
 from os import environ, getenv
 from pathlib import Path
 from typing import TYPE_CHECKING
-
+from ytmusicapi import YTMusic
 import async_spotify
 import yaml
 from async_spotify import SpotifyApiClient
@@ -39,6 +39,7 @@
 from .exts.playing._errors import LyricsNotFound, SongNotProvided
 from .player import Player
 
+ytmusic = YTMusic()
 if TYPE_CHECKING:
     from typing import TypedDict
 
@@ -470,48 +471,43 @@ async def can_connect(
                 return False
         return True
 
-    async def lyrics(self, inter: Inter, query: str | None = None) -> None:
+    async def lyrics(self, inter: Inter, song: str | None = None) -> None:
         player: Player = inter.guild.voice_client
-        if not query:
+        if not song:
             if player is None or player.current is None:
                 raise SongNotProvided
+
 
             assert player.current.title is not None
             if "-" in player.current.title:
                 q = player.current.title
-            else:
-                q = player.current.title, player.current.author
+            else:   
+                q =f"{player.current.title} {player.current.author}"
         else:
-            q = query
+            q = song
 
         await inter.response.defer()
 
-        url_search = f"https://api.flowery.pw/v1/lyrics/search?query={q}"
-
-        async with inter.client.session.get(url_search) as resp:
-            result = await resp.json()
+        searchresult = ytmusic.search(query=q,filter="songs",limit=1)
         try:
-            isrc = result["tracks"][0]["external"]["isrc"]
-            spotify_id = result["tracks"][0]["external"]["spotify_id"]
-        except KeyError as e:
-            raise LyricsNotFound from e
-
-        url_lyrics = f"https://api.flowery.pw/v1/lyrics?isrc={isrc}&spotify_id={spotify_id}&query={q}"
-
-        async with inter.client.session.get(url_lyrics) as res:
-            lyrics = await res.json()
-
+            song = ytmusic.get_watch_playlist(searchresult[0]["videoId"])
+        except IndexError:
+            raise LyricsNotFound
+        lyrics_id = song['lyrics']
         try:
-            lyrics_text = lyrics["lyrics"]["text"]
-            title = lyrics["track"]["title"]
-            artist = lyrics["track"]["artist"]
-            thumbnail = lyrics["track"]["media"]["artwork"]
-        except KeyError as e:
-            raise LyricsNotFound from e
+            lyrics_req = ytmusic.get_lyrics(browseId=lyrics_id)
+        except Exception:
+            raise LyricsNotFound
+        lyrics = lyrics_req['lyrics']
+        source = lyrics_req['source']
+        title = song['tracks'][0]['title']
+        thumbnail = song['tracks'][0]['thumbnail'][1]['url']
+        artist = song['tracks'][0]['artists'][0]['name']
 
-        lyrics_text = truncate(lyrics_text, length=4096)
+        lyrics_text = truncate(lyrics, length=4096)
 
         embed = Embed(title=title, description=lyrics_text, timestamp=utcnow())
         embed.set_author(name=artist)
         embed.set_thumbnail(url=thumbnail)
+        embed.set_footer(text=source)
         await inter.send(embed=embed, ephemeral=True)

vibr/exts/lyrics.py

@@ -13,7 +13,7 @@
 
 
 class Lyrics(CogBase[Vibr]):
-    @slash_command(dm_permission=False)
+    @slash_command()
     @voted
     async def lyrics(self, inter: Inter, query: str | None = None) -> None:
         """Get a song's lyrics
@@ -22,7 +22,7 @@ async def lyrics(self, inter: Inter, query: str | None = None) -> None:
             The song to search lyrics for, leave blank if you want the current song.
         """
 
-        await self.bot.lyrics(inter=inter, query=query)
+        await self.bot.lyrics(inter=inter, song=query)
 
 
 def setup(bot: Vibr) -> None: