Adds 204 status

cherscarlett · Feb 26, 2019 · 412ebdb · 412ebdb
1 parent ca70eee
commit 412ebdb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/api/index.js b/api/index.js
@@ -145,20 +145,17 @@ app.get('/spotify/now-playing/', async (req, res) => {
         }
       }
     )
-    if (res.status !== 204) {
-      setLastPlayed(access_token, response.data)
-      res.send(response.data)
-    } else {
-      const reply = await callStorage('get', 'last_played')
-      res.send({ data: { item: reply, is_playing: false } })
-    }
+    const { data } = response
+    setLastPlayed(access_token, data)
+    const reply = await callStorage('get', 'last_played')
+    res.send({ item: JSON.parse(reply), is_playing: Boolean(data.is_playing) })
   } catch (err) {
     console.error(err)
     res.send({ error: err.message })
   }
 })
 
-async function setLastPlayed(access_token, { item }) {
+async function setLastPlayed(access_token, item) {
   if (!Boolean(item)) {
     const { data } = await axios.get(
       `${spotifyBaseUrl}me/player/recently-played?market=US`,
@@ -169,9 +166,9 @@ async function setLastPlayed(access_token, { item }) {
         }
       }
     )
-    postStoredTrack(data.items[0])
+    postStoredTrack(data.items[0].track)
   } else {
-    postStoredTrack(item)
+    postStoredTrack(item.item)
   }
 }
 

diff --git a/store/index.js b/store/index.js
@@ -35,28 +35,16 @@ export const actions = {
   async nuxtServerInit({ commit }) {
     try {
       const redisUrl = `${clientUrl}/api/spotify/data/`
-      const promises = [
-        axios.get(`${redisUrl}is_connected`),
-        axios.get(`${redisUrl}last_played`)
-      ]
-      const [
-        {
-          data: { is_connected }
-        },
-        {
-          data: { last_played }
-        }
-      ] = await Promise.all(promises)
+      const {
+        data: { is_connected }
+      } = await axios.get(`${redisUrl}is_connected`)
 
       commit('connectionChange', is_connected)
-      if (Boolean(last_played))
-        commit('recentlyPlayedChange', JSON.parse(last_played))
 
       if (Boolean(is_connected)) {
         const {
           data: { item, is_playing }
         } = await axios.get(`${clientUrl}/api/spotify/now-playing`)
-        console.log(is_playing)
         commit('nowPlayingChange', item)
         commit('isPlayingChange', is_playing)
       }