From 1dd48ddf68c0b79540e74c5834f57f05833b41f3 Mon Sep 17 00:00:00 2001
From: Cory Dransfeldt <coryd@hey.com>
Date: Sat, 30 Mar 2024 20:15:00 -0700
Subject: [PATCH] chore: update music api

---
 api/music.js       | 11 ++++++++++-
 src/_data/music.js | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/api/music.js b/api/music.js
index bd28f2d3..5e49cca3 100644
--- a/api/music.js
+++ b/api/music.js
@@ -28,6 +28,11 @@ export default async (request) => {
 
   const scrobbles = getStore('scrobbles')
   const scrobbleData = []
+  const artists = getStore('artists')
+  const albums = getStore('albums')
+  const artistsMap = await artists.get('artists-map', { type: 'json' })
+  const albumsMap = await albums.get('albums-map', { type: 'json' })
+
   if (weeksArr.length > 0) {
     weeksArr.forEach(async (week) => {
       const weekData = await scrobbles.get(week, { type: 'json'})
@@ -41,7 +46,11 @@ export default async (request) => {
     scrobbleData.push(...windowData['data'])
   }
 
-  return new Response(JSON.stringify({ data: scrobbleData }),
+  return new Response(JSON.stringify({
+    scrobbles: scrobbleData,
+    artists: artistsMap,
+    albums: albumsMap
+  }),
     { headers: { "Content-Type": "application/json" } }
   )
 }
diff --git a/src/_data/music.js b/src/_data/music.js
index 49513dfd..6e27414b 100644
--- a/src/_data/music.js
+++ b/src/_data/music.js
@@ -1,13 +1,13 @@
-import EleventyFetch from '@11ty/eleventy-fetch';
-import { buildChart } from './helpers/music.js'
+// import EleventyFetch from '@11ty/eleventy-fetch';
+// import { buildChart } from './helpers/music.js'
 
-export default async function () {
-  const API_KEY_MUSIC = process.env.API_KEY_MUSIC;
-  const url = `https://coryd.dev/api/music?key=${API_KEY_MUSIC}`;
-  const res = EleventyFetch(url, {
-    duration: '1h',
-    type: 'json',
-  }).catch();
-  const resObj = await res;
-  return buildChart(resObj['data'])
-}
+// export default async function () {
+//   const API_KEY_MUSIC = process.env.API_KEY_MUSIC;
+//   const url = `https://coryd.dev/api/music?key=${API_KEY_MUSIC}`;
+//   const res = EleventyFetch(url, {
+//     duration: '1h',
+//     type: 'json',
+//   }).catch();
+//   const resObj = await res;
+//   return buildChart(resObj['data'])
+// }