🐛 Fix lyrics

Androz2091 · Apr 9, 2021 · af3230a · af3230a
1 parent 8e5dbe2
commit af3230a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/commands/Music/lyrics.js b/commands/Music/lyrics.js
@@ -1,7 +1,6 @@
 const Command = require("../../base/Command.js"),
 	Discord = require("discord.js"),
-	cheerio = require("cheerio"),
-	fetch = require("node-fetch");
+	lyricsParse = require("lyrics-finder");
 
 class Lyrics extends Command {
 
@@ -22,7 +21,7 @@ class Lyrics extends Command {
 
 	async run (message, args, data) {
 
-		const songName = args.join(" ");
+		const [songName, artistName] = args.join(" ").split("|");
 		if(!songName){
 			return message.error("music/lyrics:MISSING_SONG_NAME");
 		}
@@ -41,19 +40,10 @@ class Lyrics extends Command {
 				.replace(/\(lyrics|lyric|official music video|audio|official|official video|official video hd|clip officiel|clip|extended|hq\)/g, "")
 				.split(" ").join("%20");
 
-			let res = await fetch(`https://www.musixmatch.com/search/${songNameFormated}`);
-			res = await res.text();
-			let $ = await cheerio.load(res);
-			const songLink = `https://musixmatch.com${$("h2[class=\"media-card-title\"]").find("a").attr("href")}`;
+			let lyrics = await lyricsParse(songNameFormated, artistName) || "Not Found!";
 
-			res = await fetch(songLink);
-			res = await res.text();
-			$ = await cheerio.load(res);
-
-			let lyrics = await $("p[class=\"mxm-lyrics__content \"]").text();
-
-			if(lyrics.length > 2048) {
-				lyrics = lyrics.substr(0, 2031) + message.translate("music/lyrics:AND_MORE") + " ["+message.translate("music/lyrics:CLICK_HERE")+"]"+`https://www.musixmatch.com/search/${songName}`;
+			if(lyrics.length > 2040) {
+				lyrics = lyrics.substr(0, 2000) + message.translate("music/lyrics:AND_MORE") + " ["+message.translate("music/lyrics:CLICK_HERE")+"]"+`https://www.musixmatch.com/search/${songName}`;
 			} else if(!lyrics.length) {
 				return message.error("music/lyrics:NO_LYRICS_FOUND", {
 					songName
@@ -64,6 +54,7 @@ class Lyrics extends Command {
 			message.channel.send(embed);
 
 		} catch(e){
+			console.log(e);
 			message.error("music/lyrics:NO_LYRICS_FOUND", {
 				songName
 			});

diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
         "i18next": "^19.6.2",
         "i18next-node-fs-backend": "^2.1.3",
         "js-string-cleaner": "^1.0.3",
+        "lyrics-finder": "^21.7.0",
         "markdown-table": "2.0.0",
         "mathjs": "^9.0.0",
         "md5": "^2.2.1",