Compare commits

..

No commits in common. "lyrics-fix" and "main" have entirely different histories.

View file

@ -91,7 +91,6 @@ export default {
const player = useMainPlayer(); const player = useMainPlayer();
const queue = useQueue(interaction.guildId!); const queue = useQueue(interaction.guildId!);
if (request) { if (request) {
if ( if (
interaction.options.getSubcommand() === interaction.options.getSubcommand() ===
@ -109,10 +108,9 @@ export default {
} else if (queue) { } else if (queue) {
const track = queue.history.currentTrack; const track = queue.history.currentTrack;
if (track) { if (track) {
request = track.cleanTitle + " " + queue.history.currentTrack?.author;
try { try {
data = await player.lyrics.search({ data = await player.lyrics.search({
q: request, q: track.cleanTitle + " " + queue.history.currentTrack?.author,
}); });
} catch { } catch {
return await interaction.followUp(`❌ | ${loc.get("c_lyrics2")} \`${track.title}\``); return await interaction.followUp(`❌ | ${loc.get("c_lyrics2")} \`${track.title}\``);
@ -198,11 +196,7 @@ export default {
return await interaction.followUp(loc.get("c_lyrics8")); return await interaction.followUp(loc.get("c_lyrics8"));
} }
if (data) { if (data && data.length > 0 && data[0].plainLyrics !== null) {
if (data.length === 0 || (data.length > 0 && data[0].plainLyrics !== null)) {
return await interaction.followUp(`❌ | ${loc.get("c_lyrics2")} \`${request}\``);
}
const title = data[0]; const title = data[0];
const limit_desc = 4096; const limit_desc = 4096;
const nb_embed = Math.ceil(title.plainLyrics.length / limit_desc); const nb_embed = Math.ceil(title.plainLyrics.length / limit_desc);