From fc5885d52bc6405fbcc669e58e4f294742585b91 Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Tue, 19 Oct 2021 20:54:02 +0100
Subject: [PATCH] creating but not fetching

---
 lnbits/extensions/satsdice/crud.py                       | 4 +++-
 lnbits/extensions/satsdice/models.py                     | 4 ++--
 lnbits/extensions/satsdice/templates/satsdice/index.html | 3 +--
 lnbits/extensions/satsdice/views.py                      | 2 +-
 lnbits/extensions/satsdice/views_api.py                  | 5 ++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lnbits/extensions/satsdice/crud.py b/lnbits/extensions/satsdice/crud.py
index e4476a113..dd7d484ad 100644
--- a/lnbits/extensions/satsdice/crud.py
+++ b/lnbits/extensions/satsdice/crud.py
@@ -15,7 +15,9 @@ from .models import (
 from lnbits.helpers import urlsafe_short_hash
 
 
-async def create_satsdice_pay(data: CreateSatsDiceLink,) -> satsdiceLink:
+async def create_satsdice_pay(
+    data: CreateSatsDiceLink,
+) -> satsdiceLink:
     satsdice_id = urlsafe_short_hash()
     await db.execute(
         """
diff --git a/lnbits/extensions/satsdice/models.py b/lnbits/extensions/satsdice/models.py
index b38d75221..21a7a12ab 100644
--- a/lnbits/extensions/satsdice/models.py
+++ b/lnbits/extensions/satsdice/models.py
@@ -27,8 +27,8 @@ class satsdiceLink(BaseModel):
     base_url: str
     open_time: int
 
-    def lnurl(self, req: Request) -> Lnurl:
-        return lnurl_encode(req.url_for("satsdice.lnurlp_response", item_id=self.id))
+    def lnurl(self, req: Request) -> str:
+        return lnurl_encode(req.url_for("satsdice.lnurlp_response", link_id=self.id))
 
     @classmethod
     def from_row(cls, row: Row) -> "satsdiceLink":
diff --git a/lnbits/extensions/satsdice/templates/satsdice/index.html b/lnbits/extensions/satsdice/templates/satsdice/index.html
index b9c1fae95..a5ec243d9 100644
--- a/lnbits/extensions/satsdice/templates/satsdice/index.html
+++ b/lnbits/extensions/satsdice/templates/satsdice/index.html
@@ -359,6 +359,7 @@
       },
       openQrCodeDialog(linkId) {
         var link = _.findWhere(this.payLinks, {id: linkId})
+        console.log(link)
         if (link.currency) this.updateFiatRate(link.currency)
 
         this.qrCodeDialog.data = {
@@ -512,8 +513,6 @@
       }
     },
     created() {
-      console.log('this.multiValue')
-      console.log(this.g.user)
       if (this.g.user.wallets.length) {
         var getPayLinks = this.getPayLinks
         getPayLinks()
diff --git a/lnbits/extensions/satsdice/views.py b/lnbits/extensions/satsdice/views.py
index fe0ad481c..2f2f74bce 100644
--- a/lnbits/extensions/satsdice/views.py
+++ b/lnbits/extensions/satsdice/views.py
@@ -29,7 +29,7 @@ from fastapi.param_functions import Query
 templates = Jinja2Templates(directory="templates")
 
 
-@satsdice_ext.get("/", response_class=HTMLResponse)
+@satsdice_ext.get("/")
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return satsdice_renderer().TemplateResponse(
         "satsdice/index.html", {"request": request, "user": user.dict()}
diff --git a/lnbits/extensions/satsdice/views_api.py b/lnbits/extensions/satsdice/views_api.py
index 3c7471de7..315d823ce 100644
--- a/lnbits/extensions/satsdice/views_api.py
+++ b/lnbits/extensions/satsdice/views_api.py
@@ -40,9 +40,8 @@ async def api_links(
 
     try:
         links = await get_satsdice_pays(wallet_ids)
-        print(links[0])
 
-        return [{link.dict(), {"lnurl": link.lnurl(request)}} for link in links]
+        return [{**link.dict(), **{"lnurl": link.lnurl(request)}} for link in links]
     except LnurlInvalidUrl:
         raise HTTPException(
             status_code=HTTPStatus.UPGRADE_REQUIRED,
@@ -99,7 +98,7 @@ async def api_link_create_or_update(
         data.wallet_id = wallet.wallet.id
         link = await create_satsdice_pay(data)
 
-    return {link.dict(), {"lnurl": link.lnurl}}
+    return {**link.dict(), **{"lnurl": link.lnurl}}
 
 
 @satsdice_ext.delete("/api/v1/links/{link_id}")