From 9b5121ed7edd6ce67e4aeaa24bd0e2720f7b7b53 Mon Sep 17 00:00:00 2001
From: Julien Calixte <juliencalixte@gmail.com>
Date: Thu, 23 Jul 2020 22:42:37 +0200
Subject: [PATCH] :recycle: (spotify) simplify hook

---
 src/components/ZoneMusic.vue |  2 +-
 src/hooks/useSpotify.ts      | 19 -------------------
 src/locales/en.json          |  2 +-
 src/locales/fr.json          |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/components/ZoneMusic.vue b/src/components/ZoneMusic.vue
index 3634bd6..e902bfc 100644
--- a/src/components/ZoneMusic.vue
+++ b/src/components/ZoneMusic.vue
@@ -22,7 +22,7 @@
           <span v-t="'chill'"></span>
           <SpotifyMusic
             v-if="hasSpotify"
-            :play="play"
+            :play="play && hasMusic"
             @play="onPlay"
             @pause="onPause"
           />
diff --git a/src/hooks/useSpotify.ts b/src/hooks/useSpotify.ts
index 2457743..e5ec113 100644
--- a/src/hooks/useSpotify.ts
+++ b/src/hooks/useSpotify.ts
@@ -20,9 +20,6 @@ export const useSpotify = (onPlay: () => void, onPause: () => void) => {
   const { accessToken, hasValidAccessToken } = useGetters<
     GetterTree<State, State>
   >(['accessToken', 'hasValidAccessToken'])
-  const { setAccessToken, setTokenExpire, setHasSpotify } = useActions<
-    RootActions
-  >(['setAccessToken', 'setTokenExpire', 'setHasSpotify'])
 
   onMounted(() => {
     window.onSpotifyWebPlaybackSDKReady = async () => {
@@ -40,26 +37,11 @@ export const useSpotify = (onPlay: () => void, onPause: () => void) => {
         ready.value = true
       })
       spotify.player.addListener('player_state_changed', (state) => {
-        console.log('player state changed', state)
         if (!state) {
           return
         }
         !state.paused ? onPlay() : onPause()
       })
-      spotify.player.addListener('not_ready', () => {
-        setAccessToken(null)
-        setTokenExpire(null)
-        setHasSpotify(false)
-      })
-      spotify.player.on('playback_error', (error) => {
-        console.error('Failed to perform playback', error)
-      })
-      spotify.player.on('account_error', (error) => {
-        console.error('account_error', error)
-      })
-      spotify.player.on('initialization_error', (error) => {
-        console.error('initialization_error', error)
-      })
       await spotify.player.connect()
     }
     import('@/lib/spotify-player')
@@ -69,7 +51,6 @@ export const useSpotify = (onPlay: () => void, onPause: () => void) => {
     try {
       if (spotify.player && ready.value) {
         const playerState = await spotify.player.getCurrentState()
-        console.log(playerState)
 
         if (!playerState) {
           playOnSpotify(accessToken.value, deviceId.value)
diff --git a/src/locales/en.json b/src/locales/en.json
index b4569fb..adeee2f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -11,6 +11,6 @@
   },
   "music": {
     "loading": "loading...",
-    "useSpotify": "For the best experience, use"
+    "useSpotify": "For a pure experience, connect to"
   }
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index bae1ce4..787003b 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -11,6 +11,6 @@
   },
   "music": {
     "loading": "loading...",
-    "useSpotify": "Ayez une meilleure expérience avec"
+    "useSpotify": "Pour une meilleure expérience, utilisez"
   }
 }