Merge master into hooks-patches

.github/FUNDING.yml

@@ -1,7 +1,3 @@
-# These are supported funding model platforms
-
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
+open_collective: spicetify
 ko_fi: khanhnguyenxuan
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 custom: ["https://www.paypal.me/khanhas"]

.github/workflows/build.yml

@@ -19,6 +19,11 @@ jobs:
       - name: Build
         run: go build .
 
+      - name: Format
+        run: |
+          gofmt -s -l .
+          if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then exit 1; fi
+
   release:
     name: Release
     strategy:

CustomApps/lyrics-plus/ProviderGenius.js

@@ -76,34 +76,12 @@ const ProviderGenius = (function () {
             return null;
         }
 
-        let lyrics = body.match(/<div class="lyrics">(.+?)<\/div>/s);
-        if (lyrics) {
-            return lyrics[1];
-        }
-
-        let lyricsSections = body.match(/<div class="Lyrics__Container.+?>.+?<\/div>/gs);
-        if (lyricsSections) {
-            lyrics = "";
-            for (const section of lyricsSections) {
-                const fragment = section.match(/<div class="Lyrics__Container.+?>(.+?)<\/div>/s);
-                if (fragment) {
-                    lyrics += fragment[1];
-                }
-            }
-            return lyrics;
-        }
+        let lyrics = "";
+        const parser = new DOMParser();
+        const htmlDoc = parser.parseFromString(body, "text/html");
+        const lyricsDiv = htmlDoc.querySelectorAll('div[data-lyrics-container="true"]');
 
-        lyricsSections = body.match(/<div ([\w-]+=[\w"]+ )+class="Lyrics__Container.+?>.+?<\/div>/gs);
-        if (lyricsSections) {
-            lyrics = "";
-            for (const section of lyricsSections) {
-                const fragment = section.match(/<div ([\w-]+=[\w"]+ )+class="Lyrics__Container.+?>(.+?)<\/div>/s);
-                if (fragment) {
-                    lyrics += fragment[2];
-                }
-            }
-            return lyrics;
-        }
+        lyricsDiv.forEach((i) => (lyrics += i.innerHTML + "<br>"));
 
         if (!lyrics?.length) {
             console.warn("forceError");

CustomApps/lyrics-plus/Providers.js

@@ -9,7 +9,7 @@ const Providers = {
             copyright: null,
         };
 
-        const baseURL = "hm://lyrics/v1/track/";
+        const baseURL = "wg://lyrics/v1/track/";
         const id = info.uri.split(":")[2];
         let body;
         try {
@@ -20,7 +20,7 @@ const Providers = {
 
         const lines = body.lines;
         if (!lines || !lines.length) {
-            return { error: "No lyric", uri: info.uri };
+            return { error: "No lyrics", uri: info.uri };
         }
 
         if (typeof lines[0].time === "number") {
@@ -58,7 +58,7 @@ const Providers = {
                 throw "";
             }
         } catch {
-            result.error = "No lyric";
+            result.error = "No lyrics";
             return result;
         }
 
@@ -90,7 +90,7 @@ const Providers = {
         try {
             list = await ProviderNetease.findLyrics(info);
         } catch {
-            result.error = "No lyric";
+            result.error = "No lyrics";
             return result;
         }
 

CustomApps/lyrics-plus/index.js

@@ -162,7 +162,7 @@ class LyricsContainer extends react.Component {
     async fetchColors(uri) {
         let prominent = 0;
         try {
-            const colors = await CosmosAsync.get(`hm://colorextractor/v1/extract-presets?uri=${uri}&format=json`);
+            const colors = await CosmosAsync.get(`wg://colorextractor/v1/extract-presets?uri=${uri}&format=json`);
             prominent = colors.entries[0].color_swatches[4].color;
         } catch {
             prominent = 0;

CustomApps/new-releases/index.js

@@ -85,9 +85,12 @@ class Grid extends react.Component {
                 react.createElement(
                     "div",
                     {
-                        className: "main-gridContainer-gridContainer",
+                        className: "main-gridContainer-gridContainer main-gridContainer-fixedWidth",
                         style: {
                             "--minimumColumnWidth": "180px",
+                            "--column-width": "minmax(var(--minimumColumnWidth),1fr)",
+                            "--column-count": "auto-fill",
+                            "--grid-gap": "24px",
                         },
                     },
                     separatedByDate[date].map((card) => react.createElement(Card, card.props))
@@ -154,9 +157,12 @@ class Grid extends react.Component {
                 react.createElement(
                     "div",
                     {
-                        className: "main-gridContainer-gridContainer",
+                        className: "main-gridContainer-gridContainer main-gridContainer-fixedWidth",
                         style: {
                             "--minimumColumnWidth": "180px",
+                            "--column-width": "minmax(var(--minimumColumnWidth),1fr)",
+                            "--column-count": "auto-fill",
+                            "--grid-gap": "24px",
                         },
                     },
                     separatedByDate[date]
@@ -224,19 +230,20 @@ async function getArtistList() {
     const body = await CosmosAsync.get("sp://core-collection/unstable/@/list/artists/all?responseFormat=protobufJson", {
         policy: { list: { link: true, name: true } },
     });
+    count(true);
     return body.item;
 }
 
 async function getArtistEverything(artist) {
     const uid = artist.link.replace("spotify:artist:", "");
-    const body = await CosmosAsync.get(`hm://artist/v3/${uid}/desktop/entity?format=json`);
+    const body = await CosmosAsync.get(`wg://artist/v3/${uid}/desktop/entity?format=json`);
     const releases = body?.releases;
     const items = [];
     const types = [
-        [CONFIG.album, releases?.albums?.releases, Spicetify.Locale.get("album")],
-        [CONFIG["appears-on"], releases?.appears_on?.releases, Spicetify.Locale.get("artist.appears-on")],
-        [CONFIG.compilations, releases?.compilations?.releases, Spicetify.Locale.get("compilation")],
-        [CONFIG["single-ep"], releases?.singles?.releases, Spicetify.Locale.get("single") + "/" + Spicetify.Locale.get("ep")],
+        [CONFIG.album, releases.albums?.releases, Spicetify.Locale.get("album")],
+        [CONFIG["appears-on"], releases.appears_on?.releases, Spicetify.Locale.get("artist.appears-on")],
+        [CONFIG.compilations, releases.compilations?.releases, Spicetify.Locale.get("compilation")],
+        [CONFIG["single-ep"], releases.singles?.releases, Spicetify.Locale.get("single") + "/" + Spicetify.Locale.get("ep")],
     ];
     for (const type of types) {
         if (type[0] && type[1]) {
@@ -281,13 +288,25 @@ function metaFromTrack(artist, track) {
     return null;
 }
 
+var count = (function () {
+    var counter = 0;
+    return function (reset = false) {
+        return reset ? (counter = 0) : counter++;
+    };
+})();
+
 async function fetchTracks() {
     let artistList = await getArtistList();
+    Spicetify.showNotification(`Fetching releases from ${artistList.length} artists`);
 
     const requests = artistList.map(async (obj) => {
         const artist = obj.artistMetadata;
-
-        return await getArtistEverything(artist);
+        return await getArtistEverything(artist).catch((err) => {
+            console.debug("Could not fetch all releases - error code: " + err.status);
+            if ((err.status = 500)) {
+                console.debug(`Missing releases from ${count()} artists`);
+            }
+        });
     });
 
     return await Promise.all(requests);

CustomApps/reddit/index.js

@@ -323,7 +323,7 @@ async function fetchPlaylist(post) {
 async function fetchAlbum(post) {
     const arg = post.uri.split(":")[2];
     try {
-        const metadata = await Spicetify.CosmosAsync.get(`hm://album/v1/album-app/album/${arg}/desktop`);
+        const metadata = await Spicetify.CosmosAsync.get(`wg://album/v1/album-app/album/${arg}/desktop`);
         return {
             type: typesLocale.album,
             uri: post.uri,

Extensions/bookmark.js

@@ -450,7 +450,7 @@
 
     const fetchAlbum = async (uri) => {
         const base62 = uri.split(":")[2];
-        const res = await CosmosAsync.get(`hm://album/v1/album-app/album/${base62}/desktop`);
+        const res = await CosmosAsync.get(`wg://album/v1/album-app/album/${base62}/desktop`);
         return {
             uri,
             title: res.name,
@@ -474,7 +474,7 @@
 
     const fetchArtist = async (uri) => {
         const base62 = uri.split(":")[2];
-        const res = await CosmosAsync.get(`hm://artist/v1/${base62}/desktop?format=json`);
+        const res = await CosmosAsync.get(`wg://artist/v1/${base62}/desktop?format=json`);
         return {
             uri,
             title: res.info.name,

Extensions/fullAppDisplay.js

@@ -341,9 +341,10 @@ body.video-full-screen.video-full-screen--hide-ui {
 
         async getAlbumDate(uri) {
             const id = uri.replace("spotify:album:", "");
-            const albumInfo = await Spicetify.CosmosAsync.get(`hm://album/v1/album-app/album/${id}/desktop`);
 
-            const albumDate = new Date(albumInfo.year, (albumInfo.month || 1) - 1, albumInfo.day || 0);
+            const albumInfo = await Spicetify.CosmosAsync.get(`https://api.spotify.com/v1/albums/${id}`);
+
+            const albumDate = new Date(albumInfo.release_date);
             const recentDate = new Date();
             recentDate.setMonth(recentDate.getMonth() - 6);
             return albumDate.toLocaleString("default", albumDate > recentDate ? { year: "numeric", month: "short" } : { year: "numeric" });
@@ -419,25 +420,38 @@ body.video-full-screen.video-full-screen--hide-ui {
             const { innerWidth: width, innerHeight: height } = window;
             this.back.width = width;
             this.back.height = height;
-            const dim = width > height ? width : height;
 
             const ctx = this.back.getContext("2d");
             ctx.imageSmoothingEnabled = false;
             ctx.filter = `blur(30px) brightness(0.6)`;
             const blur = 30;
 
+            const x = -blur * 2;
+
+            let y, dim;
+
+            if (width > height) {
+                dim = width;
+                y = x - (width - height) / 2;
+            } else {
+                dim = height;
+                y = x;
+            }
+
+            const size = dim + 4 * blur;
+
             if (!CONFIG.enableFade) {
                 ctx.globalAlpha = 1;
-                ctx.drawImage(nextImg, -blur * 2, -blur * 2 - (width - height) / 2, dim + 4 * blur, dim + 4 * blur);
+                ctx.drawImage(nextImg, x, y, size, size);
                 return;
             }
 
             let factor = 0.0;
             const animate = () => {
                 ctx.globalAlpha = 1;
-                ctx.drawImage(prevImg, -blur * 2, -blur * 2 - (width - height) / 2, dim + 4 * blur, dim + 4 * blur);
+                ctx.drawImage(prevImg, x, y, size, size);
                 ctx.globalAlpha = Math.sin((Math.PI / 2) * factor);
-                ctx.drawImage(nextImg, -blur * 2, -blur * 2 - (width - height) / 2, dim + 4 * blur, dim + 4 * blur);
+                ctx.drawImage(nextImg, x, y, size, size);
 
                 if (factor < 1.0) {
                     factor += 0.016;

Extensions/keyboardShortcut.js

@@ -109,7 +109,7 @@
     }
 
     function clickQueueButton() {
-        document.querySelector("div.ExtraControls div.control-button-wrapper > button").click();
+        document.querySelector(".main-nowPlayingBar-right .control-button-wrapper > button").click();
     }
 
     function clickNavigatingBackButton() {

Extensions/popupLyrics.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 // NAME: Popup Lyrics
 // AUTHOR: khanhas
 //         Netease API parser and UI from https://github.com/mantou132/Spotify-Lyrics
@@ -81,13 +79,13 @@ function PopupLyrics() {
 
     class LyricProviders {
         static async fetchSpotify(info) {
-            const baseURL = "hm://lyrics/v1/track/";
+            const baseURL = "wg://lyrics/v1/track/";
             const id = info.uri.split(":")[2];
             const body = await CosmosAsync.get(baseURL + id);
 
             const lines = body.lines;
             if (!lines || !lines.length || typeof lines[0].time !== "number") {
-                return { error: "No lyric" };
+                return { error: "No lyrics" };
             }
 
             const lyrics = lines.map((a) => ({
@@ -154,7 +152,7 @@ function PopupLyrics() {
                     }));
                     return { lyrics };
                 } else {
-                    return { error: "No lyric" };
+                    return { error: "No lyrics" };
                 }
             } catch (err) {
                 return { error: err.message };
@@ -185,7 +183,7 @@ function PopupLyrics() {
             let lyricStr = meta.lrc;
 
             if (!lyricStr || !lyricStr.lyric) {
-                return { error: "No lyric" };
+                return { error: "No lyrics" };
             }
             lyricStr = lyricStr.lyric;
 
@@ -401,7 +399,7 @@ function PopupLyrics() {
             }
         }
         if (error || !sharedData.lyrics) {
-            sharedData = { error: "No lyric" };
+            sharedData = { error: "No lyrics" };
         }
     }
 
@@ -719,7 +717,7 @@ function PopupLyrics() {
                 drawText(lyricCtx, error, "red");
             }
         } else if (!lyrics) {
-            drawText(lyricCtx, "No lyric");
+            drawText(lyricCtx, "No lyrics");
         } else if (audio.duration && lyrics.length) {
             renderLyrics(lyricCtx, lyrics, audio.currentTime);
         } else if (!audio.duration || lyrics.length === 0) {

Extensions/shuffle+.js

@@ -205,7 +205,7 @@
      */
     const fetchAlbum = async (uri) => {
         const arg = uri.split(":")[2];
-        const res = await Spicetify.CosmosAsync.get(`hm://album/v1/album-app/album/${arg}/desktop`);
+        const res = await Spicetify.CosmosAsync.get(`wg://album/v1/album-app/album/${arg}/desktop`);
         const items = [];
         for (const disc of res.discs) {
             const availables = disc.tracks.filter((track) => track.playable);
@@ -231,7 +231,7 @@
      * @returns {Promise<string[]>}
      */
     const fetchArtist = async (uriBase62) => {
-        const res = await Spicetify.CosmosAsync.get(`hm://artist/v1/${uriBase62}/desktop?format=json`);
+        const res = await Spicetify.CosmosAsync.get(`wg://artist/v1/${uriBase62}/desktop?format=json`);
         return res.top_tracks.tracks.map((item) => item.uri);
     };
 
@@ -242,7 +242,7 @@
      */
     const fetchDiscography = async (uriBase62) => {
         Spicetify.showNotification(`Fetching albums list...`);
-        let res = await Spicetify.CosmosAsync.get(`hm://artist/v1/${uriBase62}/desktop?format=json`);
+        let res = await Spicetify.CosmosAsync.get(`wg://artist/v1/${uriBase62}/desktop?format=json`);
         let albums = res.releases.albums.releases;
         const tracks = [];
         for (const album of albums) {

README.md

@@ -19,9 +19,7 @@ Supports Windows, MacOS and Linux.
 - Inject Custom apps
 - Remove bloated components to improve performance
 
-#### [Installation](https://spicetify.app/docs/getting-started/simple-installation)
-#### [Basic Usage](https://spicetify.app/docs/getting-started/basic-usage)
+#### [Installation](https://spicetify.app/docs/getting-started)
+#### [Basic Usage](https://spicetify.app/docs/getting-started#basic-usage)
 #### [Customization](https://spicetify.app/docs/development/customization)
-#### [Extensions](https://spicetify.app/docs/getting-started/extensions)
-#### [Custom Apps](https://spicetify.app/docs/getting-started/custom-apps)
 #### [FAQ](https://spicetify.app/docs/faq)

css-map.json

@@ -1732,5 +1732,8 @@
     "es9mguuOfkp6pBe1Bjlw": "x-toggle-indicator",
     "Js64TOfWtHksI6TQ6knT": "x-toggle-indicatorWrapper",
     "n8tsDTs8wDH73kejYfXs": "x-toggle-input",
-    "JWYoNAyrIIdW30u4PSGE": "x-toggle-wrapper"
+    "JWYoNAyrIIdW30u4PSGE": "x-toggle-wrapper",
+    "KKJUKKP3FyKKKdRjWDVj": "main-trackInfo-container",
+    "tyIiSOWsTxiyox1_LW7F": "main-trackInfo-name",
+    "M6PIsRD7BGqgMv0WZ_Sv": "main-trackInfo-artists"
 }