From e726d752d87491e99a12db4bfd4ef77b163d542e Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Mon, 10 May 2021 20:29:26 +0100
Subject: [PATCH] Damn, spotify json broken :(

---
 .../jukebox/templates/jukebox/jukebox.html     |  6 +++---
 lnbits/extensions/jukebox/views_api.py         | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
index c373f3fe..25af9f43 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
@@ -25,7 +25,7 @@
         <p style="font-size: 22px">Pick a song</p>
         <q-select
           outlined
-          v-model="model"
+          v-model="playlist"
           :options="playlists"
           label="playlists"
         ></q-select>
@@ -85,8 +85,9 @@
     mixins: [windowMixin],
     data() {
       return {
-        currentPlaylist: JSON.parse('{{ firstPlaylist[0] | tojson }}'),
+        currentPlaylist: JSON.parse('{{ firstPlaylist | tojson }}'),
         playlists: JSON.parse('{{ playlists | tojson }}'),
+        playlist: '',
         heavyList: [],
         queued: []
       }
@@ -98,7 +99,6 @@
       this.queued[1] = this.currentPlaylist[5]
       this.queued[2] = this.currentPlaylist[6]
       this.queued[3] = this.currentPlaylist[7]
-      console.log(this.currentPlaylist)
     }
   })
 </script>
diff --git a/lnbits/extensions/jukebox/views_api.py b/lnbits/extensions/jukebox/views_api.py
index 6b6f4d92..6a0b3f51 100644
--- a/lnbits/extensions/jukebox/views_api.py
+++ b/lnbits/extensions/jukebox/views_api.py
@@ -108,6 +108,7 @@ async def api_delete_item(juke_id):
 
 ################JUKEBOX ENDPOINTS##################
 
+######GET ACCESS TOKEN######
 
 @jukebox_ext.route("/api/v1/jukebox/jb/<sp_id>/<sp_playlist>", methods=["GET"])
 async def api_get_jukebox_songs(sp_id, sp_playlist):
@@ -128,19 +129,19 @@ async def api_get_jukebox_songs(sp_id, sp_playlist):
                         return False
                     else:
                         return await api_get_jukebox_songs(sp_id, sp_playlist)
+            return r, HTTPStatus.OK
             for item in r.json()["items"]:
                 tracks.append(
                     {
-                        "id": item["track"]["id"],
-                        "name": item["track"]["name"],
-                        "album": item["track"]["album"]["name"],
-                        "artist": item["track"]["artists"][0]["name"],
-                        "image": item["track"]["album"]["images"][0]["url"],
+                        "id": str(item["track"]["id"]),
+                        "name": str(item["track"]["name"]),
+                        "album": str(item["track"]["album"]["name"]),
+                        "artist": str(item["track"]["artists"][0]["name"]),
+                        "image": str(item["track"]["album"]["images"][0]["url"]),
                     }
                 )
         except AssertionError:
             something = None
-    print(jsonify(tracks))
     return tracks, HTTPStatus.OK
 
 
@@ -188,6 +189,7 @@ async def api_get_token(sp_id):
 @jukebox_ext.route("/api/v1/jukebox/jb/<sp_id>/<sp_song>/", methods=["GET"])
 async def api_get_jukebox_invoice(sp_id, sp_song):
     jukebox = await get_jukebox(sp_id)
-    invoice = await create_invoice(wallet_id=jukebox.wallet,amount=jukebox.amount,memo="Jukebox " + jukebox.name)
-
+    invoice = await create_invoice(wallet_id=jukebox.wallet,amount=jukebox.price,memo=jukebox.title)
+    
+    ####new table needed to store payment hashes
     return invoice, HTTPStatus.OK