From d7c7a778b757d933e22f4b4cec3baf88331a1f3a Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 1 Jul 2024 19:38:36 +0800 Subject: [PATCH] fix(lyrics): crash in some circumstances --- src/commands/lyrics.ts | 2 +- src/components/buttons/lyrics.ts | 2 +- src/events/music/trackStart.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/lyrics.ts b/src/commands/lyrics.ts index 5d3ce2af..9ece5fb5 100644 --- a/src/commands/lyrics.ts +++ b/src/commands/lyrics.ts @@ -112,7 +112,7 @@ export default { romanizeFrom = 'chinese'; } const lyricsFields = generateEmbedFieldsFromLyrics(json, lyrics); - if (lyricsFields.length === 0) { + if (lyricsFields.length === 0 || !lyricsFields[0].value) { await interaction.replyHandler.locale( 'CMD.LYRICS.RESPONSE.NO_RESULTS', { type: MessageOptionsBuilderType.Error }, diff --git a/src/components/buttons/lyrics.ts b/src/components/buttons/lyrics.ts index 528a2baa..624049ca 100644 --- a/src/components/buttons/lyrics.ts +++ b/src/components/buttons/lyrics.ts @@ -65,7 +65,7 @@ export default { .join('\n'); } const lyricsFields = generateEmbedFieldsFromLyrics(json, lyrics); - if (lyricsFields.length === 0) { + if (lyricsFields.length === 0 || !lyricsFields[0].value) { await interaction.replyHandler.locale( 'CMD.LYRICS.RESPONSE.NO_RESULTS', { type: MessageOptionsBuilderType.Error }, diff --git a/src/events/music/trackStart.ts b/src/events/music/trackStart.ts index 3bb1a271..fbe24bd7 100644 --- a/src/events/music/trackStart.ts +++ b/src/events/music/trackStart.ts @@ -229,7 +229,7 @@ export default { json, lyrics, ); - if (lyricsFields.length === 0) return; + if (lyricsFields.length === 0 || !lyricsFields[0].value) return; await queue.player.handler.send( new EmbedBuilder().setFields(lyricsFields), {