From cfab334d0f0cb338fcc59e839eb6a8a6104f00c1 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:28:33 +0100
Subject: [PATCH 1/3] shorten lnurl endpoint URL for smaller QR codes

---
 lnbits/extensions/lnurlp/lnurl.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lnbits/extensions/lnurlp/lnurl.py b/lnbits/extensions/lnurlp/lnurl.py
index 3f7df9267..d2018bbe9 100644
--- a/lnbits/extensions/lnurlp/lnurl.py
+++ b/lnbits/extensions/lnurlp/lnurl.py
@@ -18,7 +18,12 @@ from .crud import increment_pay_link
 
 
 @lnurlp_ext.get(
-    "/api/v1/lnurl/{link_id}",
+    "/api/v1/lnurl/{link_id}",  # Backwards compatibility for old codes (with long URL)
+    status_code=HTTPStatus.OK,
+    name="lnurlp.api_lnurl_response",
+)
+@lnurlp_ext.get(
+    "/a/{link_id}",
     status_code=HTTPStatus.OK,
     name="lnurlp.api_lnurl_response",
 )

From 9e953bc3e1014695e7894b433be635612e12ddb4 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:30:47 +0100
Subject: [PATCH 2/3] unique name for deprecated endpoitn

---
 lnbits/extensions/lnurlp/lnurl.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnbits/extensions/lnurlp/lnurl.py b/lnbits/extensions/lnurlp/lnurl.py
index d2018bbe9..cf874035b 100644
--- a/lnbits/extensions/lnurlp/lnurl.py
+++ b/lnbits/extensions/lnurlp/lnurl.py
@@ -18,9 +18,9 @@ from .crud import increment_pay_link
 
 
 @lnurlp_ext.get(
-    "/api/v1/lnurl/{link_id}",  # Backwards compatibility for old codes (with long URL)
+    "/api/v1/lnurl/{link_id}",  # Backwards compatibility for old LNURLs / QR codes (with long URL)
     status_code=HTTPStatus.OK,
-    name="lnurlp.api_lnurl_response",
+    name="lnurlp.api_lnurl_response.deprecated",
 )
 @lnurlp_ext.get(
     "/a/{link_id}",

From 4dc94bba7dbc322cff2f6ad937105297ebc2b8a8 Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Thu, 5 Jan 2023 13:44:57 +0100
Subject: [PATCH 3/3] change link url as well

---
 lnbits/extensions/lnurlp/lnurl.py           | 2 +-
 lnbits/extensions/lnurlp/static/js/index.js | 2 +-
 lnbits/extensions/lnurlp/views.py           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lnbits/extensions/lnurlp/lnurl.py b/lnbits/extensions/lnurlp/lnurl.py
index cf874035b..8f6aa6237 100644
--- a/lnbits/extensions/lnurlp/lnurl.py
+++ b/lnbits/extensions/lnurlp/lnurl.py
@@ -23,7 +23,7 @@ from .crud import increment_pay_link
     name="lnurlp.api_lnurl_response.deprecated",
 )
 @lnurlp_ext.get(
-    "/a/{link_id}",
+    "/{link_id}",
     status_code=HTTPStatus.OK,
     name="lnurlp.api_lnurl_response",
 )
diff --git a/lnbits/extensions/lnurlp/static/js/index.js b/lnbits/extensions/lnurlp/static/js/index.js
index 1713e77f6..c1372bec4 100644
--- a/lnbits/extensions/lnurlp/static/js/index.js
+++ b/lnbits/extensions/lnurlp/static/js/index.js
@@ -17,7 +17,7 @@ var mapPayLink = obj => {
   )
   obj.amount = new Intl.NumberFormat(LOCALE).format(obj.amount)
   obj.print_url = [locationPath, 'print/', obj.id].join('')
-  obj.pay_url = [locationPath, obj.id].join('')
+  obj.pay_url = [locationPath, 'link/', obj.id].join('')
   return obj
 }
 
diff --git a/lnbits/extensions/lnurlp/views.py b/lnbits/extensions/lnurlp/views.py
index 9bc78056f..c5fa35823 100644
--- a/lnbits/extensions/lnurlp/views.py
+++ b/lnbits/extensions/lnurlp/views.py
@@ -21,7 +21,7 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
     )
 
 
-@lnurlp_ext.get("/{link_id}", response_class=HTMLResponse)
+@lnurlp_ext.get("/link/{link_id}", response_class=HTMLResponse)
 async def display(request: Request, link_id):
     link = await get_pay_link(link_id)
     if not link: