From 8f2b42309d4f90c57c399ffe9cd663600099d564 Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Wed, 11 Aug 2021 22:53:11 -0300 Subject: [PATCH] revert b7ed7fab59bd2721cdb633ac57ed875bc2fb56d5 --- lnbits/core/views/api.py | 2 +- lnbits/extensions/lnticket/tasks.py | 4 +++- lnbits/extensions/lnticket/templates/lnticket/index.html | 2 +- lnbits/extensions/lnticket/views_api.py | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py index d126b8788..811cde401 100644 --- a/lnbits/core/views/api.py +++ b/lnbits/core/views/api.py @@ -345,7 +345,7 @@ async def api_payments_sse(): message = [f"event: {typ}".encode("utf-8")] if data: - jdata = json.dumps(dict(data._asdict(), pending=False), default=str) + jdata = json.dumps(dict(data._asdict(), pending=False)) message.append(f"data: {jdata}".encode("utf-8")) yield b"\n".join(message) + b"\r\n\r\n" diff --git a/lnbits/extensions/lnticket/tasks.py b/lnbits/extensions/lnticket/tasks.py index c747e2df7..5160de1dd 100644 --- a/lnbits/extensions/lnticket/tasks.py +++ b/lnbits/extensions/lnticket/tasks.py @@ -26,10 +26,12 @@ async def on_invoice_paid(payment: Payment) -> None: # not a lnticket invoice return - ticket = await get_ticket(payment.payment_hash) + ticket = await get_ticket(payment.checking_id) if not ticket: print("this should never happen", payment) return await payment.set_pending(False) await set_ticket_paid(payment.payment_hash) + _ticket = await get_ticket(payment.checking_id) + print("ticket", _ticket) diff --git a/lnbits/extensions/lnticket/templates/lnticket/index.html b/lnbits/extensions/lnticket/templates/lnticket/index.html index dc0a15959..becb5137a 100644 --- a/lnbits/extensions/lnticket/templates/lnticket/index.html +++ b/lnbits/extensions/lnticket/templates/lnticket/index.html @@ -314,7 +314,7 @@ '/lnticket/api/v1/tickets?all_wallets', this.g.user.wallets[0].inkey ) - .then(function (response) { + .then(function (response) { self.tickets = response.data .map(function (obj) { if (!obj?.paid) return diff --git a/lnbits/extensions/lnticket/views_api.py b/lnbits/extensions/lnticket/views_api.py index 3f97ad5bb..6201a8015 100644 --- a/lnbits/extensions/lnticket/views_api.py +++ b/lnbits/extensions/lnticket/views_api.py @@ -92,6 +92,7 @@ async def api_tickets(): if "all_wallets" in request.args: wallet_ids = (await get_user(g.wallet.user)).wallet_ids + return ( jsonify([form._asdict() for form in await get_tickets(wallet_ids)]), HTTPStatus.OK,