diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py index 20ec7a964..22e54b8a2 100644 --- a/lnbits/extensions/lnaddress/lnurl.py +++ b/lnbits/extensions/lnaddress/lnurl.py @@ -55,7 +55,7 @@ async def lnurl_callback(address_id, amount: int = Query(...)): if address.wallet_endpoint.endswith("/") else address.wallet_endpoint ) - print("BASE", base_url) + print("BASE", base_url ) async with httpx.AsyncClient() as client: try: call = await client.post( diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/display.html b/lnbits/extensions/lnaddress/templates/lnaddress/display.html index 67745fa85..f820c81f6 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/display.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/display.html @@ -370,7 +370,7 @@ if (data.wallet_endpoint == '') { data.wallet_endpoint = null } - data.wallet_endpoint = data.wallet_endpoint ?? '{{ request.url_root }}' + data.wallet_endpoint = data.wallet_endpoint ?? '{{ root_url }}' data.duration = parseInt(data.duration) console.log('data', data) diff --git a/lnbits/extensions/lnaddress/templates/lnaddress/index.html b/lnbits/extensions/lnaddress/templates/lnaddress/index.html index ef04b5937..3969d6f56 100644 --- a/lnbits/extensions/lnaddress/templates/lnaddress/index.html +++ b/lnbits/extensions/lnaddress/templates/lnaddress/index.html @@ -489,6 +489,7 @@ this.getDomains() this.getAddresses() } + console.log('{{ request.url.path }}') // var self = this // // // axios is available for making requests diff --git a/lnbits/extensions/lnaddress/views.py b/lnbits/extensions/lnaddress/views.py index cec12bf89..ef6d2b766 100644 --- a/lnbits/extensions/lnaddress/views.py +++ b/lnbits/extensions/lnaddress/views.py @@ -1,4 +1,5 @@ from http import HTTPStatus +from urllib.parse import urlparse from fastapi import Request from fastapi.params import Depends @@ -34,7 +35,8 @@ async def display(domain_id, request: Request): await purge_addresses(domain_id) wallet = await get_wallet(domain.wallet) - + url = urlparse(str(request.url)) + return lnaddress_renderer().TemplateResponse( "lnaddress/display.html", { @@ -43,5 +45,6 @@ async def display(domain_id, request: Request): "domain_domain": domain.domain, "domain_cost": domain.cost, "domain_wallet_inkey": wallet.inkey, + "root_url": f"{url.scheme}://{url.netloc}" }, )