From b6ee8611660e2d61bfda4d9f5f520cb9e7639aaf Mon Sep 17 00:00:00 2001
From: Araxeus <78568641+Araxeus@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:57:39 +0300
Subject: [PATCH 1/3] Fix lyrics genius missing parts
---
plugins/lyrics-genius/front.js | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/plugins/lyrics-genius/front.js b/plugins/lyrics-genius/front.js
index 4fcb3153..8632b85b 100644
--- a/plugins/lyrics-genius/front.js
+++ b/plugins/lyrics-genius/front.js
@@ -34,17 +34,12 @@ module.exports = () => {
console.log("Fetched lyrics from Genius");
}
- const wrapper = document.createElement("div");
+ const wrapper = document.createElement("div")
wrapper.innerHTML = html;
- const lyricsSelector1 = wrapper.querySelector(".lyrics");
- const lyricsSelector2 = wrapper.querySelector(
- '[class^="Lyrics__Container"]'
- );
- const lyrics = lyricsSelector1
- ? lyricsSelector1.innerHTML
- : lyricsSelector2
- ? lyricsSelector2.innerHTML
- : null;
+ const lyricsSelector1 = Array.from(wrapper.querySelectorAll('[class^="Lyrics__Container"]')).map(d => d.innerHTML).join('
')
+ const lyricsSelector2 = wrapper.querySelector(".lyrics")?.innerHTML;
+
+ const lyrics = lyricsSelector1 || lyricsSelector2 || null
if (!lyrics) {
return;
}
From c31f6cc79718ff80bf7c0823c988edc3199383ec Mon Sep 17 00:00:00 2001
From: Araxeus <78568641+Araxeus@users.noreply.github.com>
Date: Wed, 6 Apr 2022 18:57:39 +0300
Subject: [PATCH 2/3] Fix lyrics genius missing parts
---
plugins/lyrics-genius/front.js | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/plugins/lyrics-genius/front.js b/plugins/lyrics-genius/front.js
index 4fcb3153..917132f0 100644
--- a/plugins/lyrics-genius/front.js
+++ b/plugins/lyrics-genius/front.js
@@ -36,15 +36,10 @@ module.exports = () => {
const wrapper = document.createElement("div");
wrapper.innerHTML = html;
- const lyricsSelector1 = wrapper.querySelector(".lyrics");
- const lyricsSelector2 = wrapper.querySelector(
- '[class^="Lyrics__Container"]'
- );
- const lyrics = lyricsSelector1
- ? lyricsSelector1.innerHTML
- : lyricsSelector2
- ? lyricsSelector2.innerHTML
- : null;
+
+ const lyrics = Array.from(wrapper.querySelectorAll('[class^="Lyrics__Container"]')).map(d => d.innerHTML).join('
')
+ || wrapper.querySelector(".lyrics")?.innerHTML;
+
if (!lyrics) {
return;
}
From d47b03c23debfc561a49f1dc34dbe1572c3f106e Mon Sep 17 00:00:00 2001
From: Araxeus <78568641+Araxeus@users.noreply.github.com>
Date: Wed, 6 Apr 2022 20:15:24 +0300
Subject: [PATCH 3/3] use spread syntax instead of Array.from
---
plugins/lyrics-genius/front.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/lyrics-genius/front.js b/plugins/lyrics-genius/front.js
index b62ad89e..d000a13c 100644
--- a/plugins/lyrics-genius/front.js
+++ b/plugins/lyrics-genius/front.js
@@ -37,7 +37,7 @@ module.exports = () => {
const wrapper = document.createElement("div");
wrapper.innerHTML = html;
- const lyrics = Array.from(wrapper.querySelectorAll('[class^="Lyrics__Container"]')).map(d => d.innerHTML).join('
')
+ const lyrics = [...wrapper.querySelectorAll('[class^="Lyrics__Container"]')].map(d => d.innerHTML).join('
')
|| wrapper.querySelector(".lyrics")?.innerHTML;
if (!lyrics) {