Merge pull request #362 from arcbtc/FastAPI

ready for testing branch

lnbits/extensions/tipjar/models.py

@@ -12,6 +12,17 @@ from typing import Optional, NamedTuple
 from fastapi import FastAPI, Request
 
 
+class CreateCharge(BaseModel):
+    onchainwallet: str = Query(None)
+    lnbitswallet: str = Query(None)
+    description: str = Query(...)
+    webhook: str = Query(None)
+    completelink: str = Query(None)
+    completelinktext: str = Query(None)
+    time: int = Query(..., ge=1)
+    amount: int = Query(..., ge=1)
+
+
 class createTip(BaseModel):
     id: str
     wallet: str

lnbits/extensions/tipjar/views_api.py

@@ -27,7 +27,7 @@ from .crud import (
     delete_tipjar,
 )
 from ..satspay.crud import create_charge
-from .models import createTipJar, createTips, createTip
+from .models import createTipJar, createTips, createTip, CreateCharge
 
 
 @tipjar_ext.post("/api/v1/tipjars")
@@ -64,19 +64,18 @@ async def api_create_tip(data: createTips):
     if not name:
         name = "Anonymous"
     description = f'"{name}": {message}'
-
     charge = await create_charge(
         user=charge_details["user"],
-        data={
+        data=CreateCharge(
-            "amount": sats,
+            amount=sats,
-            "webhook": webhook,
+            webhook=webhook,
-            "description": description,
+            description=description,
-            "onchainwallet": charge_details["onchainwallet"],
+            onchainwallet=charge_details["onchainwallet"],
-            "lnbitswallet": charge_details["lnbitswallet"],
+            lnbitswallet=charge_details["lnbitswallet"],
-            "completelink": charge_details["completelink"],
+            completelink=charge_details["completelink"],
-            "completelinktext": charge_details["completelinktext"],
+            completelinktext=charge_details["completelinktext"],
-            "time": charge_details["time"],
+            time=charge_details["time"],
-        },
+        ),
     )
 
     await create_tip(