From 2fb16d0382d5fe963c89fab4c7b605dc2cfc6c0b Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Sat, 21 Aug 2021 19:04:10 +0100
Subject: [PATCH] Trying to add query params

---
 lnbits/core/views/api.py           |  2 --
 lnbits/core/views/generic.py       | 15 ++++++++-------
 lnbits/extensions/events/models.py | 10 ++++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index fb20b034..b47ba51e 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -7,8 +7,6 @@ from urllib.parse import urlparse, urlunparse, urlencode, parse_qs, ParseResult
 from quart import g, current_app, make_response, url_for
 
 from fastapi import Query
-from fastapi.encoders import jsonable_encoder
-
 
 from http import HTTPStatus
 from binascii import unhexlify
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py
index ece69fb0..c781fb92 100644
--- a/lnbits/core/views/generic.py
+++ b/lnbits/core/views/generic.py
@@ -65,12 +65,13 @@ async def extensions():
     return await templates.TemplateResponse("core/extensions.html", {"request": request, "user": get_user(g.user.id)})
 
 
-@core_app.get("/wallet")
+@core_app.get("/wallet{usr}{wal}{nme}")
+#Not sure how to validate
 @validate_uuids(["usr", "wal"])
-async def wallet():
-    user_id = request.args.get("usr", type=str)
-    wallet_id = request.args.get("wal", type=str)
-    wallet_name = request.args.get("nme", type=str)
+async def wallet(request: Request, usr: Optional[str], wal: Optional[str], nme: Optional[str]):
+    user_id = usr
+    wallet_id = wal
+    wallet_name = nme
     service_fee = int(SERVICE_FEE) if int(SERVICE_FEE) == SERVICE_FEE else SERVICE_FEE
 
     # just wallet_name: create a new user, then create a new wallet for user with wallet_name
@@ -102,8 +103,8 @@ async def wallet():
     if not wallet:
         abort(HTTPStatus.FORBIDDEN, "Not your wallet.")
 
-    return await render_template(
-        "core/wallet.html", user=user, wallet=wallet, service_fee=service_fee
+    return await templates.TemplateResponse(
+        "core/wallet.html", {"request":request,"user":user, "wallet":wallet, "service_fee":service_fee}
     )
 
 
diff --git a/lnbits/extensions/events/models.py b/lnbits/extensions/events/models.py
index 0f79fa41..59b8071d 100644
--- a/lnbits/extensions/events/models.py
+++ b/lnbits/extensions/events/models.py
@@ -1,7 +1,9 @@
-from typing import NamedTuple
+from sqlite3 import Row
+from pydantic import BaseModel
+#from typing import NamedTuple
 
 
-class Events(NamedTuple):
+class Events(BaseModel):
     id: str
     wallet: str
     name: str
@@ -15,7 +17,7 @@ class Events(NamedTuple):
     time: int
 
 
-class Tickets(NamedTuple):
+class Tickets(BaseModel):
     id: str
     wallet: str
     event: str
@@ -23,4 +25,4 @@ class Tickets(NamedTuple):
     email: str
     registered: bool
     paid: bool
-    time: int
+    time: int
\ No newline at end of file