highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-02 14:09:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pydantic being quietly pydantic

Browse Source
This commit is contained in:
benarc
2021-10-13 11:20:40 +01:00
parent d5a4dc801f
commit 16f9f1612f
3 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lnbits/extensions/copilot/crud.py
View File

@@ -37,7 +37,7 @@ async def create_copilot(
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""", """,
( (
data.copilot_id, copilot_id,
data.user, data.user,
int(data.lnurl_toggle), int(data.lnurl_toggle),
data.wallet, data.wallet,

51
lnbits/extensions/copilot/models.py
View File

@@ -1,38 +1,35 @@
import json
from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
from starlette.requests import Request from starlette.requests import Request
from fastapi.param_functions import Query from fastapi.param_functions import Query
from typing import Optional, Dict from typing import Optional, Dict
from lnbits.lnurl import encode as lnurl_encode # type: ignore from lnbits.lnurl import encode as lnurl_encode # type: ignore
from lnurl.types import LnurlPayMetadata # type: ignore from lnurl.types import LnurlPayMetadata # type: ignore
from sqlite3 import Row
from pydantic import BaseModel from pydantic import BaseModel
class CreateCopilotData(BaseModel): class CreateCopilotData(BaseModel):
id: Optional[str] = None user: str = Query(None)
user: Optional[str] = None title: str = Query(None)
title: Optional[str] = None lnurl_toggle: int = Query(None)
lnurl_toggle: Optional[int] = None wallet: str = Query(None)
wallet: Optional[str] = None animation1: str = Query(None)
animation1: Optional[str] = None animation2: str = Query(None)
animation2: Optional[str] = None animation3: str = Query(None)
animation3: Optional[str] = None animation1threshold: int = Query(None)
animation1threshold: Optional[int] = None animation2threshold: int = Query(None)
animation2threshold: Optional[int] = None animation3threshold: int = Query(None)
animation3threshold: Optional[int] = None animation1webhook: str = Query(None)
animation1webhook: Optional[str] = None animation2webhook: str = Query(None)
animation2webhook: Optional[str] = None animation3webhook: str = Query(None)
animation3webhook: Optional[str] = None lnurl_title: str = Query(None)
lnurl_title: Optional[str] = None show_message: int = Query(None)
show_message: Optional[int] = None show_ack: int = Query(None)
show_ack: Optional[int] = None show_price: str = Query(None)
show_price: Optional[int] = None amount_made: int = Query(None)
amount_made: Optional[int] = None timestamp: int = Query(None)
timestamp: Optional[int] = None fullscreen_cam: int = Query(None)
fullscreen_cam: Optional[int] = None iframe_url: int = Query(None)
iframe_url: Optional[int] = None success_url: str = Query(None)
success_url: Optional[str] = None
class Copilots(BaseModel): class Copilots(BaseModel):
@@ -59,10 +56,6 @@ class Copilots(BaseModel):
fullscreen_cam: int fullscreen_cam: int
iframe_url: str iframe_url: str
@classmethod
def from_row(cls, row: Row) -> "Copilots":
return cls(**dict(row))
def lnurl(self, req: Request) -> str: def lnurl(self, req: Request) -> str:
url = req.url_for("copilot.lnurl_response", link_id=self.id) url = req.url_for("copilot.lnurl_response", link_id=self.id)
return lnurl_encode(url) return lnurl_encode(url)

2
lnbits/extensions/copilot/views_api.py
View File

@@ -69,11 +69,9 @@ async def api_copilot_create_or_update(
copilot_id: str = Query(None), copilot_id: str = Query(None),
wallet: WalletTypeInfo = Depends(get_key_type), wallet: WalletTypeInfo = Depends(get_key_type),
): ):
print("cunt")
if not copilot_id: if not copilot_id:
copilot = await create_copilot(data, inkey=wallet.wallet.inkey) copilot = await create_copilot(data, inkey=wallet.wallet.inkey)
return copilot, HTTPStatus.CREATED return copilot, HTTPStatus.CREATED
else: else:
copilot = await update_copilot(data, copilot_id=copilot_id) copilot = await update_copilot(data, copilot_id=copilot_id)