From 95e95861bf980df939e144340320f5836833e0fe Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Tue, 19 Mar 2024 14:46:54 -0700 Subject: [PATCH] chore: update some more artist data --- api/now-playing.js | 18 ++++++++++++++---- package.json | 2 +- src/_data/artistCapitalization.js | 5 +++++ src/api/artist-capitalization.liquid | 6 ++++++ 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 src/_data/artistCapitalization.js create mode 100644 src/api/artist-capitalization.liquid diff --git a/api/now-playing.js b/api/now-playing.js index 61298da2..7d2acdcf 100644 --- a/api/now-playing.js +++ b/api/now-playing.js @@ -123,11 +123,21 @@ export default async () => { console.log(err); return {} }); + const artistCapitalzationRes = await fetch("https://coryd.dev/api/artist-capitalization", { + type: "json", + }).then((data) => { + if (data.ok) return data.json() + throw new Error('Something went wrong with the artist capitalization endpoint.'); + }).catch(err => { + console.log(err); + return {} + }); const track = trackRes["recenttracks"]["track"][0]; - const artist = track["artist"]["#text"]; + const artist = artistCapitalization(track["artist"]["#text"]); let mbid = track["artist"]["mbid"]; - let genre = ""; + let genre = ''; const mbidMap = (artist) => mbidRes[artist.toLowerCase()] || ""; + const artistCapitalization = (artist) => artistCapitalzationRes[artist?.toLowerCase()] || artist // mbid mismatches if (mbidMap(artist) !== "") mbid = mbidMap(artist); @@ -162,9 +172,9 @@ export default async () => { return new Response(JSON.stringify({ content: `${emojiMap( genre, - track["artist"]["#text"] + artist )} ${track["name"]} by ${ - track["artist"]["#text"] + artist }`, }), { headers } diff --git a/package.json b/package.json index e53f00b7..cfd21c3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "8.3.6", + "version": "8.3.7", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/artistCapitalization.js b/src/_data/artistCapitalization.js new file mode 100644 index 00000000..33db83bb --- /dev/null +++ b/src/_data/artistCapitalization.js @@ -0,0 +1,5 @@ +import artistCapitalizationPatches from './json/artist-capitalization-patches.js'; + +export default async function () { + return artistCapitalizationPatches +} diff --git a/src/api/artist-capitalization.liquid b/src/api/artist-capitalization.liquid new file mode 100644 index 00000000..a438dbb2 --- /dev/null +++ b/src/api/artist-capitalization.liquid @@ -0,0 +1,6 @@ +--- +layout: null +eleventyExcludeFromCollections: true +permalink: /api/artist-capitalization +--- +{{ artistCapitalization | json }} \ No newline at end of file