fix: old api

This commit is contained in:
Vlad Stan 2024-10-04 10:41:04 +03:00
commit fb5a357eb8
3 changed files with 13 additions and 19 deletions

16
crud.py
View file

@ -1,7 +1,7 @@
from typing import List, Optional, Union from typing import List, Optional, Union
from lnbits.db import Database 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 .models import CreatePayLinkData, LnurlpSettings, PayLink
from .nostr.key import PrivateKey from .nostr.key import PrivateKey
@ -15,15 +15,12 @@ async def get_or_create_lnurlp_settings() -> LnurlpSettings:
return LnurlpSettings(**row) return LnurlpSettings(**row)
else: else:
settings = LnurlpSettings(nostr_private_key=PrivateKey().hex()) 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 return settings
async def update_lnurlp_settings(settings: LnurlpSettings) -> LnurlpSettings: async def update_lnurlp_settings(settings: LnurlpSettings) -> LnurlpSettings:
await db.execute( await db.update("lnurlp.settings", settings)
update_query("lnurlp.settings", settings, where=""),
settings.dict(),
)
return settings return settings
@ -66,7 +63,7 @@ async def create_pay_link(data: CreatePayLinkData) -> PayLink:
fiat_base_multiplier=data.fiat_base_multiplier, 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 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: async def update_pay_link(link: PayLink) -> PayLink:
await db.execute( await db.update("lnurlp.pay_links")
update_query("lnurlp.pay_links", link),
link.dict(),
)
return link return link

View file

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

View file

@ -19,7 +19,7 @@ def lnurlp_renderer():
@lnurlp_generic_router.get("/", response_class=HTMLResponse) @lnurlp_generic_router.get("/", response_class=HTMLResponse)
async def index(request: Request, user: User = Depends(check_user_exists)): async def index(request: Request, user: User = Depends(check_user_exists)):
return lnurlp_renderer().TemplateResponse( return lnurlp_renderer().TemplateResponse(
"lnurlp/index.html", {"request": request, "user": user.dict()} "lnurlp/index.html", {"request": request, "user": user.json()}
) )