From 6e33784061cd1cb05b7d79a99fc0d367c911a4bc Mon Sep 17 00:00:00 2001 From: ben Date: Thu, 12 Jan 2023 22:39:20 +0000 Subject: [PATCH] Removed lnurlp tests --- lnbits/core/crud.py | 12 ++++++++++++ lnbits/core/views/api.py | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lnbits/core/crud.py b/lnbits/core/crud.py index cc1867882..3979e7916 100644 --- a/lnbits/core/crud.py +++ b/lnbits/core/crud.py @@ -647,3 +647,15 @@ async def get_tinyurl(tinyurl_id: str) -> Optional[BalanceCheck]: (tinyurl_id), ) return TinyURL.from_row(row) if row else None + + +async def get_tinyurl_by_url(url: str) -> Optional[BalanceCheck]: + row = await db.fetchone( + """ + SELECT * + FROM tiny_url + WHERE url = ? + """, + (url), + ) + return TinyURL.from_row(row) if row else None \ No newline at end of file diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py index dd824ee6c..fb05241c2 100644 --- a/lnbits/core/views/api.py +++ b/lnbits/core/views/api.py @@ -51,6 +51,7 @@ from ..crud import ( get_payments, get_standalone_payment, get_tinyurl, + get_tinyurl_by_url, get_total_balance, get_wallet_for_key, save_balance_check, @@ -715,15 +716,17 @@ async def websocket_update_get(item_id: str, data: str): @core_app.post("/api/v1/tinyurl") async def api_create_tinyurl(url: str): + tinyurl = await get_tinyurl_by_url(url) + if tinyurl: + return tinyurl return await create_tinyurl(url) - @core_app.get("/api/v1/tinyurl/{tinyurl_id}") async def api_get_tinyurl(tinyurl_id: str): return await get_tinyurl(tinyurl_id) -@core_app.get("/{tinyurl_id}") +@core_app.get("/t/{tinyurl_id}") async def api_tinyurl(tinyurl_id: str): tinyurl = await get_tinyurl(tinyurl_id) if tinyurl: