diff --git a/lnbits/extensions/scrub/config.json b/lnbits/extensions/scrub/config.json index 9045b658..d08d3934 100644 --- a/lnbits/extensions/scrub/config.json +++ b/lnbits/extensions/scrub/config.json @@ -1,8 +1,6 @@ { - "name": "scrub", + "name": "Scrub", "short_description": "Pass payments to LNURLp/LNaddress", "icon": "send", - "contributors": [ - "arcbtc" - ] + "contributors": ["arcbtc"] } diff --git a/lnbits/extensions/scrub/views.py b/lnbits/extensions/scrub/views.py index 21c2b528..d373e5b2 100644 --- a/lnbits/extensions/scrub/views.py +++ b/lnbits/extensions/scrub/views.py @@ -21,7 +21,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)): "scrub/index.html", {"request": request, "user": user.dict()} ) - +# DO WE NEED THIS ?! @scrub_ext.get("/{link_id}", response_class=HTMLResponse) async def display(request: Request, link_id): link = await get_scrub_link(link_id) @@ -32,7 +32,7 @@ async def display(request: Request, link_id): ctx = {"request": request, "lnurl": link.lnurl(req=request)} return scrub_renderer().TemplateResponse("scrub/display.html", ctx) - +# DO WE NEED THIS ?! @scrub_ext.get("/print/{link_id}", response_class=HTMLResponse) async def print_qr(request: Request, link_id): link = await get_scrub_link(link_id) diff --git a/lnbits/extensions/scrub/views_api.py b/lnbits/extensions/scrub/views_api.py index ff5b8e59..176693ad 100644 --- a/lnbits/extensions/scrub/views_api.py +++ b/lnbits/extensions/scrub/views_api.py @@ -8,7 +8,6 @@ from starlette.exceptions import HTTPException from lnbits.core.crud import get_user from lnbits.decorators import WalletTypeInfo, get_key_type, require_admin_key -from lnbits.utils.exchange_rates import currencies, get_fiat_rate_satoshis from . import scrub_ext from .crud import ( @@ -18,12 +17,7 @@ from .crud import ( get_scrub_links, update_scrub_link, ) -from .models import CreateScrubLink, ScrubLink - - -@scrub_ext.get("/api/v1/currencies") -async def api_list_currencies_available(): - return list(currencies.keys()) +from .models import CreateScrubLink @scrub_ext.get("/api/v1/links", status_code=HTTPStatus.OK) @@ -39,7 +33,7 @@ async def api_links( try: return [ - {**link.dict()} + link.dict() for link in await get_scrub_links(wallet_ids) ] @@ -112,13 +106,3 @@ async def api_link_delete(link_id, wallet: WalletTypeInfo = Depends(require_admi await delete_scrub_link(link_id) raise HTTPException(status_code=HTTPStatus.NO_CONTENT) - - -@scrub_ext.get("/api/v1/rate/{currency}", status_code=HTTPStatus.OK) -async def api_check_fiat_rate(currency): - try: - rate = await get_fiat_rate_satoshis(currency) - except AssertionError: - rate = None - - return {"rate": rate}