From ee9490ab68901514ad55f307d71024fc0d9444e3 Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Mon, 16 Aug 2021 09:39:14 +0100
Subject: [PATCH] Fixed multiple play bug in jukebox

---
 .../jukebox/templates/jukebox/jukebox.html    | 59 ++++++++++---------
 1 file changed, 32 insertions(+), 27 deletions(-)

diff --git a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
index 2e7bd297..cb3ab49d 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html
@@ -169,43 +169,48 @@
               LNbits.api
                 .request(
                   'GET',
-                  '/jukebox/api/v1/jukebox/jb/invoicep/' +
-                    self.receive.id +
-                    '/{{ juke_id }}/' +
-                    self.receive.paymentHash
+                  '/jukebox/api/v1/jukebox/jb/checkinvoice/' +
+                    self.receive.paymentHash +
+                    '/{{ juke_id }}'
                 )
                 .then(function (res) {
-                  console.log(
-                    '/jukebox/api/v1/jukebox/jb/invoicep/' +
-                      self.receive.id +
-                      '/{{ juke_id }}/' +
-                      self.receive.paymentHash
-                  )
-                  console.log(res.data)
-                  console.log(self.receive.id)
-                  if (res.data[2] == self.receive.id) {
+                  console.log(res)
+                  if (res.data.paid == true) {
                     clearInterval(dialog.paymentChecker)
-                    dialog.dismissMsg()
-                    self.receive.dialogues.second = false
+                    LNbits.api
+                      .request(
+                        'GET',
+                        '/jukebox/api/v1/jukebox/jb/invoicep/' +
+                          self.receive.id +
+                          '/{{ juke_id }}/' +
+                          self.receive.paymentHash
+                      )
+                      .then(function (ress) {
+                        console.log(ress)
+                        if (ress.data[2] == self.receive.id) {
+                          clearInterval(dialog.paymentChecker)
+                          dialog.dismissMsg()
+                          self.receive.dialogues.second = false
 
-                    self.$q.notify({
-                      type: 'positive',
-                      message:
-                        'Success! "' +
-                        self.receive.name +
-                        '" will be played soon',
-                      timeout: 3000
-                    })
-                    self.receive.dialogues.first = false
+                          self.$q.notify({
+                            type: 'positive',
+                            message:
+                              'Success! "' +
+                              self.receive.name +
+                              '" will be played soon',
+                            timeout: 3000
+                          })
+                          self.receive.dialogues.first = false
+                        }
+                      })
                   }
                 })
             }, 3000)
-          })
-          .finally(
+
             setTimeout(() => {
               self.getCurrent()
             }, 500)
-          )
+          })
           .catch(err => {
             self.$q.notify({
               color: 'warning',