From d8eafa3e130d65011ac4c126c721c13fa5a84a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 7 Oct 2024 08:10:58 +0200 Subject: [PATCH] fix qrcodes and type ignores --- crud.py | 10 +++---- poetry.lock | 38 ++++++++++++------------- templates/withdraw/display.html | 5 +--- templates/withdraw/index.html | 2 -- templates/withdraw/print_qr.html | 1 - templates/withdraw/print_qr_custom.html | 1 - 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/crud.py b/crud.py index 0df5358..1b3471f 100644 --- a/crud.py +++ b/crud.py @@ -43,7 +43,7 @@ async def get_withdraw_link(link_id: str, num=0) -> Optional[WithdrawLink]: link: WithdrawLink = await db.fetchone( "SELECT * FROM withdraw.withdraw_link WHERE id = :id", {"id": link_id}, - WithdrawLink, + WithdrawLink, # type: ignore ) if not link: return None @@ -56,7 +56,7 @@ async def get_withdraw_link_by_hash(unique_hash: str, num=0) -> Optional[Withdra link = await db.fetchone( "SELECT * FROM withdraw.withdraw_link WHERE unique_hash = :hash", {"hash": unique_hash}, - WithdrawLink, + WithdrawLink, # type: ignore ) if not link: return None @@ -78,7 +78,7 @@ async def get_withdraw_links( ORDER BY open_time DESC LIMIT :limit OFFSET :offset """, {"limit": limit, "offset": offset}, - WithdrawLink, + WithdrawLink, # type: ignore ) total = await db.fetchone( @@ -137,12 +137,12 @@ async def create_hash_check(the_hash: str, lnurl_id: str) -> HashCheck: async def get_hash_check(the_hash: str, lnurl_id: str) -> HashCheck: hash_check = await db.fetchone( - "SELECT * FROM withdraw.hash_check WHERE id = :id", {"id": the_hash}, HashCheck + "SELECT * FROM withdraw.hash_check WHERE id = :id", {"id": the_hash}, HashCheck # type: ignore ) hash_check_lnurl = await db.fetchone( "SELECT * FROM withdraw.hash_check WHERE lnurl_id = :id", {"id": lnurl_id}, - HashCheck, + HashCheck, # type: ignore ) if not hash_check_lnurl: await create_hash_check(the_hash, lnurl_id) diff --git a/poetry.lock b/poetry.lock index ea40124..95f96e3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -768,21 +768,21 @@ files = [ [[package]] name = "dnspython" -version = "2.6.1" +version = "2.7.0" description = "DNS toolkit" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "dnspython-2.6.1-py3-none-any.whl", hash = "sha256:5ef3b9680161f6fa89daf8ad451b5f1a33b18ae8a1c6778cdf4b43f08c0a6e50"}, - {file = "dnspython-2.6.1.tar.gz", hash = "sha256:e8f0f9c23a7b7cb99ded64e6c3a6f3e701d78f50c55e002b839dea7225cff7cc"}, + {file = "dnspython-2.7.0-py3-none-any.whl", hash = "sha256:b4c34b7d10b51bcc3a5071e7b8dee77939f1e878477eeecc965e9835f63c6c86"}, + {file = "dnspython-2.7.0.tar.gz", hash = "sha256:ce9c432eda0dc91cf618a5cedf1a4e142651196bbcd2c80e89ed5a907e5cfaf1"}, ] [package.extras] -dev = ["black (>=23.1.0)", "coverage (>=7.0)", "flake8 (>=7)", "mypy (>=1.8)", "pylint (>=3)", "pytest (>=7.4)", "pytest-cov (>=4.1.0)", "sphinx (>=7.2.0)", "twine (>=4.0.0)", "wheel (>=0.42.0)"] -dnssec = ["cryptography (>=41)"] +dev = ["black (>=23.1.0)", "coverage (>=7.0)", "flake8 (>=7)", "hypercorn (>=0.16.0)", "mypy (>=1.8)", "pylint (>=3)", "pytest (>=7.4)", "pytest-cov (>=4.1.0)", "quart-trio (>=0.11.0)", "sphinx (>=7.2.0)", "sphinx-rtd-theme (>=2.0.0)", "twine (>=4.0.0)", "wheel (>=0.42.0)"] +dnssec = ["cryptography (>=43)"] doh = ["h2 (>=4.1.0)", "httpcore (>=1.0.0)", "httpx (>=0.26.0)"] -doq = ["aioquic (>=0.9.25)"] -idna = ["idna (>=3.6)"] +doq = ["aioquic (>=1.0.0)"] +idna = ["idna (>=3.7)"] trio = ["trio (>=0.23)"] wmi = ["wmi (>=1.5.1)"] @@ -1090,13 +1090,13 @@ cryptography = ">=2.5" [[package]] name = "httpcore" -version = "1.0.5" +version = "1.0.6" description = "A minimal low-level HTTP client." optional = false python-versions = ">=3.8" files = [ - {file = "httpcore-1.0.5-py3-none-any.whl", hash = "sha256:421f18bac248b25d310f3cacd198d55b8e6125c107797b609ff9b7a6ba7991b5"}, - {file = "httpcore-1.0.5.tar.gz", hash = "sha256:34a38e2f9291467ee3b44e89dd52615370e152954ba21721378a87b2960f7a61"}, + {file = "httpcore-1.0.6-py3-none-any.whl", hash = "sha256:27b59625743b85577a8c0e10e55b50b5368a4f2cfe8cc7bcfa9cf00829c2682f"}, + {file = "httpcore-1.0.6.tar.gz", hash = "sha256:73f6dbd6eb8c21bbf7ef8efad555481853f5f6acdeaff1edb0694289269ee17f"}, ] [package.dependencies] @@ -1107,7 +1107,7 @@ h11 = ">=0.13,<0.15" asyncio = ["anyio (>=4.0,<5.0)"] http2 = ["h2 (>=3,<5)"] socks = ["socksio (==1.*)"] -trio = ["trio (>=0.22.0,<0.26.0)"] +trio = ["trio (>=0.22.0,<1.0)"] [[package]] name = "httpx" @@ -2246,13 +2246,13 @@ full = ["httpx (>=0.22.0)", "itsdangerous", "jinja2", "python-multipart (>=0.0.7 [[package]] name = "tomli" -version = "2.0.1" +version = "2.0.2" description = "A lil' TOML parser" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, + {file = "tomli-2.0.2-py3-none-any.whl", hash = "sha256:2ebe24485c53d303f690b0ec092806a085f07af5a5aa1464f3931eec36caaa38"}, + {file = "tomli-2.0.2.tar.gz", hash = "sha256:d46d457a85337051c36524bc5349dd91b1877838e2979ac5ced3e710ed8a60ed"}, ] [[package]] @@ -2348,13 +2348,13 @@ test = ["Cython (>=0.29.36,<0.30.0)", "aiohttp (==3.9.0b0)", "aiohttp (>=3.8.1)" [[package]] name = "virtualenv" -version = "20.26.5" +version = "20.26.6" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.7" files = [ - {file = "virtualenv-20.26.5-py3-none-any.whl", hash = "sha256:4f3ac17b81fba3ce3bd6f4ead2749a72da5929c01774948e243db9ba41df4ff6"}, - {file = "virtualenv-20.26.5.tar.gz", hash = "sha256:ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4"}, + {file = "virtualenv-20.26.6-py3-none-any.whl", hash = "sha256:7345cc5b25405607a624d8418154577459c3e0277f5466dd79c49d5e492995f2"}, + {file = "virtualenv-20.26.6.tar.gz", hash = "sha256:280aede09a2a5c317e409a00102e7077c6432c5a38f0ef938e643805a7ad2c48"}, ] [package.dependencies] diff --git a/templates/withdraw/display.html b/templates/withdraw/display.html index 1b20fc3..e345ed4 100644 --- a/templates/withdraw/display.html +++ b/templates/withdraw/display.html @@ -11,10 +11,7 @@ - + > diff --git a/templates/withdraw/index.html b/templates/withdraw/index.html index 3cef48c..9e34ed0 100644 --- a/templates/withdraw/index.html +++ b/templates/withdraw/index.html @@ -411,8 +411,6 @@ {% raw %} diff --git a/templates/withdraw/print_qr.html b/templates/withdraw/print_qr.html index 4e00e52..4bdab58 100644 --- a/templates/withdraw/print_qr.html +++ b/templates/withdraw/print_qr.html @@ -12,7 +12,6 @@
diff --git a/templates/withdraw/print_qr_custom.html b/templates/withdraw/print_qr_custom.html index bd43354..07fa87b 100644 --- a/templates/withdraw/print_qr_custom.html +++ b/templates/withdraw/print_qr_custom.html @@ -11,7 +11,6 @@