From fb5a357eb8d0cd1a729e827f6c5df40f1c3ff605 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Fri, 4 Oct 2024 10:41:04 +0300
Subject: [PATCH] fix: old api

---
 crud.py                         | 16 +++++-----------
 templates/lnurlp/_api_docs.html | 14 +++++++-------
 views.py                        |  2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

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 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X GET {{ request.base_url }}lnurlp/api/v1/links -H "X-Api-Key:
-          {{ user.wallets[0].inkey }}"
+          <span v-text="g.user.wallets[0].inkey"></span> "
         </code>
       </q-card-section>
     </q-card>
@@ -41,7 +41,7 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X GET {{ request.base_url }}lnurlp/api/v1/links/&lt;pay_id&gt;
-          -H "X-Api-Key: {{ user.wallets[0].inkey }}"
+          -H "X-Api-Key: <span v-text="g.user.wallets[0].inkey"></span>"
         </code>
       </q-card-section>
     </q-card>
@@ -74,7 +74,7 @@
           '{"description": &lt;string&gt;, "amount": &lt;integer&gt;, "max":
           &lt;integer&gt;, "min": &lt;integer&gt;, "comment_chars":
           &lt;integer&gt;}' -H "Content-type: application/json" -H "X-Api-Key:
-          {{ user.wallets[0].adminkey }}"
+          <span v-text="g.user.wallets[0].adminkey"></span>"
         </code>
       </q-card-section>
     </q-card>
@@ -103,8 +103,8 @@
         <code
           >curl -X PUT {{ request.base_url }}lnurlp/api/v1/links/&lt;pay_id&gt;
           -d '{"description": &lt;string&gt;, "amount": &lt;integer&gt;}' -H
-          "Content-type: application/json" -H "X-Api-Key: {{
-          user.wallets[0].adminkey }}"
+          "Content-type: application/json" -H "X-Api-Key:
+          <span v-text="g.user.wallets[0].adminkey"></span>"
         </code>
       </q-card-section>
     </q-card>
@@ -129,8 +129,8 @@
         <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
         <code
           >curl -X DELETE {{ request.base_url
-          }}lnurlp/api/v1/links/&lt;pay_id&gt; -H "X-Api-Key: {{
-          user.wallets[0].adminkey }}"
+          }}lnurlp/api/v1/links/&lt;pay_id&gt; -H "X-Api-Key:
+          <span v-text="g.user.wallets[0].adminkey"></span>"
         </code>
       </q-card-section>
     </q-card>
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()}
     )