diff --git a/lnbits/extensions/jukebox/crud.py b/lnbits/extensions/jukebox/crud.py index 074791c10..a24d8a7ec 100644 --- a/lnbits/extensions/jukebox/crud.py +++ b/lnbits/extensions/jukebox/crud.py @@ -3,7 +3,6 @@ from typing import List, Optional from . import db from .models import Jukebox, JukeboxPayment from lnbits.helpers import urlsafe_short_hash -import json async def create_jukebox( diff --git a/lnbits/extensions/jukebox/models.py b/lnbits/extensions/jukebox/models.py index 1d57a0284..03c41d674 100644 --- a/lnbits/extensions/jukebox/models.py +++ b/lnbits/extensions/jukebox/models.py @@ -1,9 +1,4 @@ -import json -import base64 -import hashlib -from collections import OrderedDict -from quart import url_for -from typing import NamedTuple, Optional, List, Dict +from typing import NamedTuple from sqlite3 import Row diff --git a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html index 5089daa18..0d2543387 100644 --- a/lnbits/extensions/jukebox/templates/jukebox/jukebox.html +++ b/lnbits/extensions/jukebox/templates/jukebox/jukebox.html @@ -161,7 +161,7 @@ 'GET', '/jukebox/api/v1/jukebox/jb/invoicep/' + song_id + '/{{ juke_id }}/' + self.receive.paymentHash) .then(function (response1) { - console.log(response1) + if (response1.data[2] == song_id) { setTimeout(function(){ self.getCurrent() }, 500) self.$q.notify({ @@ -201,7 +201,7 @@ 'filla' ) .then(function (response) { - console.log(response.data.paid) + self.paid = response.data.paid }) .catch(function (error) { @@ -216,7 +216,7 @@ '/jukebox/api/v1/jukebox/jb/currently/{{juke_id}}') .then(function (res) { if (res.data.id) { - console.log(res.data) + self.currentlyPlaying = res.data } }) diff --git a/lnbits/extensions/jukebox/views.py b/lnbits/extensions/jukebox/views.py index ac7a7a150..f439110a0 100644 --- a/lnbits/extensions/jukebox/views.py +++ b/lnbits/extensions/jukebox/views.py @@ -5,13 +5,11 @@ from http import HTTPStatus import trio from lnbits.decorators import check_user_exists, validate_uuids from lnbits.core.models import Payment -from functools import wraps import json from . import jukebox_ext from .crud import get_jukebox from .views_api import api_get_jukebox_device_check -from urllib.parse import unquote @jukebox_ext.route("/") diff --git a/lnbits/extensions/jukebox/views_api.py b/lnbits/extensions/jukebox/views_api.py index ac5147254..c584aca89 100644 --- a/lnbits/extensions/jukebox/views_api.py +++ b/lnbits/extensions/jukebox/views_api.py @@ -1,10 +1,6 @@ from quart import g, jsonify, request from http import HTTPStatus -from lnurl.exceptions import InvalidUrl as LnurlInvalidUrl # type: ignore -from base64 import urlsafe_b64encode import base64 -import json -import time from lnbits.core.crud import get_wallet from lnbits.core.services import create_invoice, check_invoice_status @@ -15,14 +11,12 @@ from .crud import ( create_jukebox, update_jukebox, get_jukebox, - get_jukebox_by_user, get_jukeboxs, delete_jukebox, create_jukebox_payment, get_jukebox_payment, update_jukebox_payment, ) -from .models import Jukebox from lnbits.core.services import create_invoice, check_invoice_status