Update complete

Powers/__init__.py

@@ -8,6 +8,8 @@ from sys import stdout, version_info
 from time import time
 from traceback import format_exc
 
+import lyricsgenius
+
 LOG_DATETIME = datetime.now().strftime("%d_%m_%Y-%H_%M_%S")
 LOGDIR = f"{__name__}/logs"
 
@@ -56,7 +58,22 @@ LOGGER.info("------------------------")
 LOGGER.info(f"Version: {Config.VERSION}")
 LOGGER.info(f"Owner: {str(Config.OWNER_ID)}")
 LOGGER.info("Source Code: https://github.com/Gojo-Bots/Gojo_Satoru\n")
+LOGGER.info("Checking lyrics genius api...")
+if Config.GENIUS_API_TOKEN:
+    LOGGER.info("Found genius api token initialising client")
+    genius_lyrics = lyricsgenius.Genius(
+        "VOT0IxuOq2CzSfAF1xwerHFNpKGyivUxZtWyHPm1ucjM4iWb1LxG-aKSE-YuG5e46ZMRg6yUUtsBcz_OGKPzug",
+        skip_non_songs=True,
+        excluded_terms=["(Remix)", "(Live)"],
+        remove_section_headers=True,
+    )
+    is_genius_lyrics = True
 
+    genius_lyrics.verbose = False
+    LOGGER.info("Client setup complete")
+elif not Config.GENIUS_API_TOKEN:
+    LOGGER.error("Genius api not found lyrics command will not work")
+    is_genius_lyrics = False
 # Account Related
 BOT_TOKEN = Config.BOT_TOKEN
 API_ID = Config.API_ID

Powers/plugins/utils.py

@@ -80,12 +80,13 @@ async def gdpr_remove(_, m: Message):
     )
     await m.stop_propagation()
 
-
-'''
 @Gojo.on_message(
     command("lyrics") & (filters.group | filters.private),
 )
 async def get_lyrics(_, m: Message):
+    if not is_genius_lyrics:
+        await m.reply_text("Genius lyrics api is missing")
+        return
     if len(m.text.split()) <= 1:
         await m.reply_text(text="Please check help on how to use this this command.")
         return
@@ -97,16 +98,24 @@ async def get_lyrics(_, m: Message):
         return
     song_name = query
     em = await m.reply_text(text=f"Finding lyrics for <code>{song_name}<code>...")
-    song = Song.find_song(query)
+    try:
+        song = genius_lyrics.search_song(query)
+    except Exception as e:
+        await em.delete()
+        await m.reply_text("Connection error try again after sometime")
+        return
+        
     if song:
         if song.lyrics:
-            reply = song.format()
+            reply = song.lyrics
+            reply = reply.split("\n",1)[1]
+            artist = song.artist
         else:
             reply = "Couldn't find any lyrics for that song!"
     else:
         reply = "Song not found!"
     try:
-        await em.edit_text(reply)
+        await em.edit_text(f"**{query.capitalize()} by {artist}**\n`{reply}`")
     except MessageTooLong:
         with BytesIO(str.encode(await remove_markdown_and_html(reply))) as f:
             f.name = "lyrics.txt"
@@ -115,7 +124,7 @@ async def get_lyrics(_, m: Message):
             )
         await em.delete()
     return
-'''
+
 
 
 @Gojo.on_message(
@@ -345,6 +354,7 @@ Some utils provided by bot to make your tasks easy!
 • /id: Get the current group id. If used by replying to a message, get that user's id.
 • /info: Get information about a user.
 • /gifid: Reply to a gif to me to tell you its file ID.
+• /lyrics `<song name>` : Find your song and give the lyrics of the song
 • /wiki: `<query>`: wiki your query.
 • /tr `<language>`: Translates the text and then replies to you with the language you have specifed, works as a reply to message.
 • /git `<username>`: Search for the user using github api!

Powers/vars.py

@@ -37,6 +37,7 @@ class Config:
             default="1344569458",
         ).split(" ")
     ]
+    GENIUS_API_TOKEN = config("GENIUS_API")
     DB_URI = config("DB_URI", default="")
     DB_NAME = config("DB_NAME", default="")
     NO_LOAD = config("NO_LOAD", default="").split()
@@ -66,6 +67,7 @@ class Development:
     DB_URI = ""  # Your mongo DB URI
     DB_NAME = ""  # Your DB name
     NO_LOAD = []
+    GENIUS_API_TOKEN = ""
     PREFIX_HANDLER = ["!", "/"]
     SUPPORT_GROUP = "SUPPORT_GROUP"
     SUPPORT_CHANNEL = "SUPPORT_CHANNEL"

app.json

@@ -82,6 +82,11 @@
         "required": false,
         "value": " "
       },
+      "GENIUS_API" : {
+        "description": "Your Lyrics Genius Api Token. To fetch lyrics of songs",
+        "required": false,
+        "value": ""
+      },
       "WORKERS": {
         "description": "Number of workers to run the bot.",
         "required": false,

requirements.txt

@@ -9,6 +9,7 @@ charset-normalizer==2.1.0; python_version >= "3.7" and python_version < "4" and
 dnspython==2.2.1; python_version >= "3.6" and python_version < "4.0"
 google==3.0.0
 gpytranslate==1.4.0; python_version >= "3.6"
+lyricsgenius==3.0.1
 lxml==4.9.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0"
 prettyconf==2.2.1
 pyaes==1.6.1; python_version >= "3.6" and python_version < "4.0"