diff --git a/crud.py b/crud.py index 93fa71a..13fb531 100644 --- a/crud.py +++ b/crud.py @@ -1,7 +1,7 @@ from typing import List, Optional, Union from lnbits.db import Database -from lnbits.helpers import insert_query, update_query, urlsafe_short_hash +from lnbits.helpers import urlsafe_short_hash from .models import CreatePayLinkData, LnurlpSettings, PayLink from .nostr.key import PrivateKey @@ -15,15 +15,12 @@ async def get_or_create_lnurlp_settings() -> LnurlpSettings: return LnurlpSettings(**row) else: settings = LnurlpSettings(nostr_private_key=PrivateKey().hex()) - await db.execute(insert_query("lnurlp.settings", settings), settings.dict()) + await db.insert("lnurlp.settings", settings) return settings async def update_lnurlp_settings(settings: LnurlpSettings) -> LnurlpSettings: - await db.execute( - update_query("lnurlp.settings", settings, where=""), - settings.dict(), - ) + await db.update("lnurlp.settings", settings) return settings @@ -66,7 +63,7 @@ async def create_pay_link(data: CreatePayLinkData) -> PayLink: fiat_base_multiplier=data.fiat_base_multiplier, ) - await db.execute(insert_query("lnurlp.pay_links", link), link.dict()) + await db.insert("lnurlp.pay_links", link) return link @@ -97,10 +94,7 @@ async def get_pay_links(wallet_ids: Union[str, List[str]]) -> List[PayLink]: async def update_pay_link(link: PayLink) -> PayLink: - await db.execute( - update_query("lnurlp.pay_links", link), - link.dict(), - ) + await db.update("lnurlp.pay_links") return link diff --git a/templates/lnurlp/_api_docs.html b/templates/lnurlp/_api_docs.html index 9c07eba..948c737 100644 --- a/templates/lnurlp/_api_docs.html +++ b/templates/lnurlp/_api_docs.html @@ -19,7 +19,7 @@
curl -X GET {{ request.base_url }}lnurlp/api/v1/links -H "X-Api-Key:
- {{ user.wallets[0].inkey }}"
+ "
@@ -41,7 +41,7 @@
curl -X GET {{ request.base_url }}lnurlp/api/v1/links/<pay_id>
- -H "X-Api-Key: {{ user.wallets[0].inkey }}"
+ -H "X-Api-Key: "
@@ -74,7 +74,7 @@
'{"description": <string>, "amount": <integer>, "max":
<integer>, "min": <integer>, "comment_chars":
<integer>}' -H "Content-type: application/json" -H "X-Api-Key:
- {{ user.wallets[0].adminkey }}"
+ "
@@ -103,8 +103,8 @@
curl -X PUT {{ request.base_url }}lnurlp/api/v1/links/<pay_id>
-d '{"description": <string>, "amount": <integer>}' -H
- "Content-type: application/json" -H "X-Api-Key: {{
- user.wallets[0].adminkey }}"
+ "Content-type: application/json" -H "X-Api-Key:
+ "
@@ -129,8 +129,8 @@
curl -X DELETE {{ request.base_url
- }}lnurlp/api/v1/links/<pay_id> -H "X-Api-Key: {{
- user.wallets[0].adminkey }}"
+ }}lnurlp/api/v1/links/<pay_id> -H "X-Api-Key:
+ "
diff --git a/views.py b/views.py
index adf5a83..1ad3ff8 100644
--- a/views.py
+++ b/views.py
@@ -19,7 +19,7 @@ def lnurlp_renderer():
@lnurlp_generic_router.get("/", response_class=HTMLResponse)
async def index(request: Request, user: User = Depends(check_user_exists)):
return lnurlp_renderer().TemplateResponse(
- "lnurlp/index.html", {"request": request, "user": user.dict()}
+ "lnurlp/index.html", {"request": request, "user": user.json()}
)