From c1a82dad9d1ecf8b97d73fabf543a48e8a5cbe14 Mon Sep 17 00:00:00 2001
From: Stefan Stammberger <some.fusion@gmail.com>
Date: Sun, 10 Oct 2021 11:05:43 +0200
Subject: [PATCH] fix: lnurlp templates and path functions

While rendering the tempaltes the link.lnurl() function was not found
as no request object was passed.

Compute the lnurl before rendering the template. This way we can avoid
computing it multiple times and do not to have to pass the request object
in the template.
---
 lnbits/extensions/lnurlp/templates/lnurlp/display.html  | 6 +++---
 lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html | 2 +-
 lnbits/extensions/lnurlp/views.py                       | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/display.html b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
index a2e0389ca..08e4de15c 100644
--- a/lnbits/extensions/lnurlp/templates/lnurlp/display.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
@@ -4,10 +4,10 @@
     <q-card class="q-pa-lg">
       <q-card-section class="q-pa-none">
         <div class="text-center">
-          <a href="lightning:{{ link.lnurl }}">
+          <a href="lightning:{{ lnurl }}">
             <q-responsive :ratio="1" class="q-mx-md">
               <qrcode
-                value="{{ link.lnurl }}"
+                value="{{ lnurl }}"
                 :options="{width: 800}"
                 class="rounded-borders"
               ></qrcode>
@@ -15,7 +15,7 @@
           </a>
         </div>
         <div class="row q-mt-lg">
-          <q-btn outline color="grey" @click="copyText('{{ link.lnurl }}')"
+          <q-btn outline color="grey" @click="copyText('{{ lnurl }}')"
             >Copy LNURL</q-btn
           >
         </div>
diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html b/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
index a6a98f4d4..4e3152e8d 100644
--- a/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/print_qr.html
@@ -1,7 +1,7 @@
 {% extends "print.html" %} {% block page %}
 <div class="row justify-center">
   <div class="qr">
-    <qrcode value="{{ link.lnurl }}" :options="{width}"></qrcode>
+    <qrcode value="{{ lnurl }}" :options="{width}"></qrcode>
   </div>
 </div>
 {% endblock %} {% block styles %}
diff --git a/lnbits/extensions/lnurlp/views.py b/lnbits/extensions/lnurlp/views.py
index 27a769f74..74cbd87bc 100644
--- a/lnbits/extensions/lnurlp/views.py
+++ b/lnbits/extensions/lnurlp/views.py
@@ -30,8 +30,8 @@ async def display(request: Request,link_id):
             detail="Pay link does not exist."
         )
         # abort(HTTPStatus.NOT_FOUND, "Pay link does not exist.")
-
-    return lnurlp_renderer().TemplateResponse("lnurlp/display.html", {"request": request, "link":link})
+    ctx = {"request": request, "lnurl":link.lnurl(req=request)}
+    return lnurlp_renderer().TemplateResponse("lnurlp/display.html", ctx)
 
 
 @lnurlp_ext.get("/print/{link_id}", response_class=HTMLResponse)
@@ -43,5 +43,5 @@ async def print_qr(request: Request,link_id):
             detail="Pay link does not exist."
         )
         # abort(HTTPStatus.NOT_FOUND, "Pay link does not exist.")
-
-    return lnurlp_renderer().TemplateResponse("lnurlp/print_qr.html", {"request": request, "link":link})
+    ctx = {"request": request, "lnurl":link.lnurl(req=request)}
+    return lnurlp_renderer().TemplateResponse("lnurlp/print_qr.html", ctx)