From 4a0609d94f217de6f113adb9ad8307b68ae4f24d Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt <coryd@hey.com> Date: Mon, 29 Apr 2024 04:44:51 -0700 Subject: [PATCH] chore: cleanup --- api/now-playing.js | 118 ++++++++++++++++++++++----------------------- package.json | 2 +- 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/api/now-playing.js b/api/now-playing.js index 0eef12ce..94fa1ae2 100644 --- a/api/now-playing.js +++ b/api/now-playing.js @@ -1,48 +1,48 @@ import { getStore } from '@netlify/blobs' const emojiMap = (genre, artist) => { - const DEFAULT = "๐ง"; - const normalizedArtist = artist?.toLowerCase(); - if (normalizedArtist === "afi") return "โต๏ธ๐ "; - if (normalizedArtist === "agalloch") return "๐๏ธ"; - if (normalizedArtist === "augury") return "โ๏ธ"; - if (normalizedArtist === "autopsy") return "๐ง"; - if (normalizedArtist === "balance and composure") return "๐ช"; - if (normalizedArtist === "bedsore") return "๐๏ธ"; - if (normalizedArtist === "birds in row") return "๐ฆ ๐ฆ๐ฆข"; - if (normalizedArtist === "black flag") return "๐ด"; - if (normalizedArtist === "blink-182") return "๐ต"; - if (normalizedArtist === "blood incantation") return "๐ฝ"; + const DEFAULT = "๐ง" + const normalizedArtist = artist?.toLowerCase() + if (normalizedArtist === "afi") return "โต๏ธ๐ " + if (normalizedArtist === "agalloch") return "๐๏ธ" + if (normalizedArtist === "augury") return "โ๏ธ" + if (normalizedArtist === "autopsy") return "๐ง" + if (normalizedArtist === "balance and composure") return "๐ช" + if (normalizedArtist === "bedsore") return "๐๏ธ" + if (normalizedArtist === "birds in row") return "๐ฆ ๐ฆ๐ฆข" + if (normalizedArtist === "black flag") return "๐ด" + if (normalizedArtist === "blink-182") return "๐ต" + if (normalizedArtist === "blood incantation") return "๐ฝ" if (normalizedArtist === "bolt thrower") return "โ๏ธ" - if (normalizedArtist === "bruce springsteen") return "๐บ๐ธ"; - if (normalizedArtist === "carcass") return "๐ฅผ"; - if (normalizedArtist === "counting crows") return "๐ฆโโฌ"; - if (normalizedArtist === "david bowie") return "๐จ๐ปโ๐ค"; - if (normalizedArtist === "cevoid of thought") return "๐ซ๐ญ"; - if (normalizedArtist === "drug church") return "๐โช๏ธ"; - if (normalizedArtist === "fleshwater") return "๐ค"; - if (normalizedArtist === "full of hell & nothing") return "๐ซจ๐ธ"; - if (normalizedArtist === "imperial triumphant") return "๐ญ"; - if (normalizedArtist === "mastodon") return "๐"; - if (normalizedArtist === "minor threat") return "๐จ๐ปโ๐ฆฒ"; - if (normalizedArtist === "nomeansno") return "๐ต๐ฎ๐ฌ"; - if (normalizedArtist === "nothing") return "๐ณ๏ธ"; - if (normalizedArtist === "panopticon") return "๐ช๐ชฆ"; - if (normalizedArtist === "radiohead") return "๐ป"; - if (normalizedArtist === "taylor swift") return "๐ธ๐ผ"; - if (normalizedArtist === "the mars volta") return "๐ก๐ฎ"; - if (normalizedArtist === "thrice") return "๐จโ๐จ๐"; + if (normalizedArtist === "bruce springsteen") return "๐บ๐ธ" + if (normalizedArtist === "carcass") return "๐ฅผ" + if (normalizedArtist === "counting crows") return "๐ฆโโฌ" + if (normalizedArtist === "david bowie") return "๐จ๐ปโ๐ค" + if (normalizedArtist === "cevoid of thought") return "๐ซ๐ญ" + if (normalizedArtist === "drug church") return "๐โช๏ธ" + if (normalizedArtist === "fleshwater") return "๐ค" + if (normalizedArtist === "full of hell & nothing") return "๐ซจ๐ธ" + if (normalizedArtist === "imperial triumphant") return "๐ญ" + if (normalizedArtist === "mastodon") return "๐" + if (normalizedArtist === "minor threat") return "๐จ๐ปโ๐ฆฒ" + if (normalizedArtist === "nomeansno") return "๐ต๐ฎ๐ฌ" + if (normalizedArtist === "nothing") return "๐ณ๏ธ" + if (normalizedArtist === "panopticon") return "๐ช๐ชฆ" + if (normalizedArtist === "radiohead") return "๐ป" + if (normalizedArtist === "taylor swift") return "๐ธ๐ผ" + if (normalizedArtist === "the mars volta") return "๐ก๐ฎ" + if (normalizedArtist === "thrice") return "๐จโ๐จ๐" if (normalizedArtist === "tom waits") return "๐คน๐ป" - if (normalizedArtist === "webbed wing") return "๐คก"; + if (normalizedArtist === "webbed wing") return "๐คก" // early return for bad input - if (!genre) return DEFAULT; + if (!genre) return DEFAULT - if (genre.includes("death metal") || genre.includes("death-doom")) return "๐"; - if (genre.includes("black metal") || genre.includes("blackgaze")) return "๐ชฆ"; - if (genre.includes("metal")) return "๐ค"; - if (genre.includes("emo") || genre.includes("blues")) return "๐ข"; - if (genre.includes("grind") || genre.includes("powerviolence")) return "๐ซจ"; + if (genre.includes("death metal") || genre.includes("death-doom")) return "๐" + if (genre.includes("black metal") || genre.includes("blackgaze")) return "๐ชฆ" + if (genre.includes("metal")) return "๐ค" + if (genre.includes("emo") || genre.includes("blues")) return "๐ข" + if (genre.includes("grind") || genre.includes("powerviolence")) return "๐ซจ" if ( genre.includes("country") || genre.includes("americana") || @@ -50,17 +50,17 @@ const emojiMap = (genre, artist) => { genre.includes("folk") || genre.includes("songwriter") ) - return "๐ช"; - if (genre.includes("post-punk")) return "๐"; - if (genre.includes("dance-punk")) return "๐ชฉ"; - if (genre.includes("punk") || genre.includes("hardcore")) return "โ"; - if (genre.includes("hip hop")) return "๐ค"; + return "๐ช" + if (genre.includes("post-punk")) return "๐" + if (genre.includes("dance-punk")) return "๐ชฉ" + if (genre.includes("punk") || genre.includes("hardcore")) return "โ" + if (genre.includes("hip hop")) return "๐ค" if (genre.includes("progressive") || genre.includes("experimental")) - return "๐ค"; - if (genre.includes("jazz")) return "๐บ"; - if (genre.includes("psychedelic")) return "๐"; - if (genre.includes("dance") || genre.includes("electronic")) return "๐ป"; - if (genre.includes("ambient")) return "๐คซ"; + return "๐ค" + if (genre.includes("jazz")) return "๐บ" + if (genre.includes("psychedelic")) return "๐" + if (genre.includes("dance") || genre.includes("electronic")) return "๐ป" + if (genre.includes("ambient")) return "๐คซ" if ( genre.includes("alternative") || genre.includes("rock") || @@ -68,18 +68,17 @@ const emojiMap = (genre, artist) => { genre.includes("screamo") || genre.includes("grunge") ) - return "๐ธ"; - return DEFAULT; -}; + return "๐ธ" + return DEFAULT +} export default async () => { - const TV_KEY = Netlify.env.get("API_KEY_TRAKT"); + const TV_KEY = Netlify.env.get("API_KEY_TRAKT") const scrobbles = getStore('scrobbles') const headers = { "Content-Type": "application/json", "Cache-Control": "public, s-maxage=360, stale-while-revalidate=1080", - }; - + } const traktRes = await fetch("https://api.trakt.tv/users/cdransf/watching", { headers: { "Content-Type": "application/json", @@ -89,13 +88,13 @@ export default async () => { }) .then((data) => { if (data.status === 204) return {} - if (data.ok) return data?.json(); - throw new Error('Something went wrong with the Trakt endpoint.'); + if (data.ok) return data?.json() + throw new Error('Something went wrong with the Trakt endpoint.') }) .catch(err => { - console.log(err); + console.log(err) return {} - }); + }) if (Object.keys(traktRes).length) { if (traktRes["type"] === "episode") { @@ -114,7 +113,6 @@ export default async () => { ) } } - const scrobbleData = await scrobbles.get('now-playing', { type: 'json'}) if (!scrobbleData) return new Response(JSON.stringify({}, { headers })) @@ -129,9 +127,9 @@ export default async () => { }), { headers } ) -}; +} export const config = { cache: "manual", path: "/api/now-playing" -}; +} \ No newline at end of file diff --git a/package.json b/package.json index beefbb38..e96466fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "13.0.5", + "version": "13.0.6", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": {