From 2c1d02940d87f933262add364852a04a7cde98af Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 3 Jan 2023 23:17:22 +0100 Subject: [PATCH] fix mypy for lnbits/extensions/lnticket --- lnbits/extensions/lnticket/tasks.py | 2 +- lnbits/extensions/lnticket/views.py | 1 + lnbits/extensions/lnticket/views_api.py | 9 +++++---- pyproject.toml | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lnbits/extensions/lnticket/tasks.py b/lnbits/extensions/lnticket/tasks.py index 746ebea94..e84a75129 100644 --- a/lnbits/extensions/lnticket/tasks.py +++ b/lnbits/extensions/lnticket/tasks.py @@ -19,7 +19,7 @@ async def wait_for_paid_invoices(): async def on_invoice_paid(payment: Payment) -> None: - if payment.extra.get("tag") != "lnticket": + if not payment.extra or payment.extra.get("tag") != "lnticket": # not a lnticket invoice return diff --git a/lnbits/extensions/lnticket/views.py b/lnbits/extensions/lnticket/views.py index 9c11c79e7..9bb1d9b3a 100644 --- a/lnbits/extensions/lnticket/views.py +++ b/lnbits/extensions/lnticket/views.py @@ -33,6 +33,7 @@ async def display(request: Request, form_id): ) wallet = await get_wallet(form.wallet) + assert wallet return lnticket_renderer().TemplateResponse( "lnticket/display.html", diff --git a/lnbits/extensions/lnticket/views_api.py b/lnbits/extensions/lnticket/views_api.py index cf6145b31..35d6eaff8 100644 --- a/lnbits/extensions/lnticket/views_api.py +++ b/lnbits/extensions/lnticket/views_api.py @@ -1,8 +1,7 @@ import re from http import HTTPStatus -from fastapi import Query -from fastapi.params import Depends +from fastapi import Depends, Query from starlette.exceptions import HTTPException from lnbits.core.crud import get_user @@ -35,7 +34,8 @@ async def api_forms_get( wallet_ids = [wallet.wallet.id] if all_wallets: - wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids + user = await get_user(wallet.wallet.user) + wallet_ids = user.wallet_ids if user else [] return [form.dict() for form in await get_forms(wallet_ids)] @@ -91,7 +91,8 @@ async def api_tickets( wallet_ids = [wallet.wallet.id] if all_wallets: - wallet_ids = (await get_user(wallet.wallet.user)).wallet_ids + user = await get_user(wallet.wallet.user) + wallet_ids = user.wallet_ids if user else [] return [form.dict() for form in await get_tickets(wallet_ids)] diff --git a/pyproject.toml b/pyproject.toml index ff186de3b..1a5769dbe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -98,7 +98,6 @@ exclude = """(?x)( | ^lnbits/extensions/livestream. | ^lnbits/extensions/lnaddress. | ^lnbits/extensions/lndhub. - | ^lnbits/extensions/lnticket. | ^lnbits/extensions/lnurldevice. | ^lnbits/extensions/lnurlp. | ^lnbits/extensions/offlineshop.