Body (application/json)
{"out": false, "amount": <int>, "memo": <string>, "unit":
- <string>, "webhook": <url:string>}
Returns 201 CREATED (application/json)
diff --git a/lnbits/core/templates/core/extensions.html b/lnbits/core/templates/core/extensions.html
index daeb660f..1b527903 100644
--- a/lnbits/core/templates/core/extensions.html
+++ b/lnbits/core/templates/core/extensions.html
@@ -2,10 +2,23 @@
%} {% block scripts %} {{ window_vars(user) }}
{% endblock %} {% block page %}
+
+
+
+
+
+
+
diff --git a/lnbits/core/views/api.py b/lnbits/core/views/api.py
index 2a4cc3e8..9fee6063 100644
--- a/lnbits/core/views/api.py
+++ b/lnbits/core/views/api.py
@@ -7,30 +7,23 @@ from typing import Dict, List, Optional, Union
from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
import httpx
-
-from loguru import logger
-
-from fastapi import Header, Query, Request
+from fastapi import Depends, Header, Query, Request
from fastapi.exceptions import HTTPException
-from fastapi.param_functions import Depends
from fastapi.params import Body
+from loguru import logger
from pydantic import BaseModel
from pydantic.fields import Field
from sse_starlette.sse import EventSourceResponse
from lnbits import bolt11, lnurl
-from lnbits.bolt11 import Invoice
from lnbits.core.models import Payment, Wallet
from lnbits.decorators import (
- WalletAdminKeyChecker,
- WalletInvoiceKeyChecker,
WalletTypeInfo,
get_key_type,
require_admin_key,
require_invoice_key,
)
from lnbits.helpers import url_for, urlsafe_short_hash
-from lnbits.requestvars import g
from lnbits.settings import LNBITS_ADMIN_USERS, LNBITS_SITE_TITLE
from lnbits.utils.exchange_rates import (
currencies,
@@ -149,6 +142,7 @@ class CreateInvoiceData(BaseModel):
lnurl_balance_check: Optional[str] = None
extra: Optional[dict] = None
webhook: Optional[str] = None
+ internal: Optional[bool] = False
bolt11: Optional[str] = None
@@ -175,6 +169,7 @@ async def api_payments_create_invoice(data: CreateInvoiceData, wallet: Wallet):
description_hash=description_hash,
extra=data.extra,
webhook=data.webhook,
+ internal=data.internal,
conn=conn,
)
except InvoiceFailure as e:
@@ -395,7 +390,7 @@ async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
wallet = None
try:
if X_Api_Key.extra:
- logger.warn("No key")
+ logger.warning("No key")
except:
wallet = await get_wallet_for_key(X_Api_Key)
payment = await get_standalone_payment(
@@ -435,10 +430,8 @@ async def api_payment(payment_hash, X_Api_Key: Optional[str] = Header(None)):
return {"paid": not payment.pending, "preimage": payment.preimage}
-@core_app.get(
- "/api/v1/lnurlscan/{code}", dependencies=[Depends(WalletInvoiceKeyChecker())]
-)
-async def api_lnurlscan(code: str):
+@core_app.get("/api/v1/lnurlscan/{code}")
+async def api_lnurlscan(code: str, wallet: WalletTypeInfo = Depends(get_key_type)):
try:
url = lnurl.decode(code)
domain = urlparse(url).netloc
@@ -466,7 +459,7 @@ async def api_lnurlscan(code: str):
params.update(kind="auth")
params.update(callback=url) # with k1 already in it
- lnurlauth_key = g().wallet.lnurlauth_key(domain)
+ lnurlauth_key = wallet.wallet.lnurlauth_key(domain)
params.update(pubkey=lnurlauth_key.verifying_key.to_string("compressed").hex())
else:
async with httpx.AsyncClient() as client:
@@ -582,14 +575,19 @@ async def api_payments_decode(data: DecodePayment):
return {"message": "Failed to decode"}
-@core_app.post("/api/v1/lnurlauth", dependencies=[Depends(WalletAdminKeyChecker())])
-async def api_perform_lnurlauth(callback: str):
- err = await perform_lnurlauth(callback)
+class Callback(BaseModel):
+ callback: str = Query(...)
+
+
+@core_app.post("/api/v1/lnurlauth")
+async def api_perform_lnurlauth(
+ callback: Callback, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
+ err = await perform_lnurlauth(callback.callback, wallet=wallet)
if err:
raise HTTPException(
status_code=HTTPStatus.SERVICE_UNAVAILABLE, detail=err.reason
)
-
return ""
diff --git a/lnbits/core/views/generic.py b/lnbits/core/views/generic.py
index b6750c95..86f7ecff 100644
--- a/lnbits/core/views/generic.py
+++ b/lnbits/core/views/generic.py
@@ -7,11 +7,10 @@ from fastapi.exceptions import HTTPException
from fastapi.params import Depends, Query
from fastapi.responses import FileResponse, RedirectResponse
from fastapi.routing import APIRouter
+from loguru import logger
from pydantic.types import UUID4
from starlette.responses import HTMLResponse, JSONResponse
-from loguru import logger
-
from lnbits.core import db
from lnbits.core.models import User
from lnbits.decorators import check_user_exists
@@ -113,7 +112,7 @@ async def wallet(
if not user_id:
user = await get_user((await create_account()).id)
- logger.info(f"Created new account for user {user.id}")
+ logger.info(f"Create user {user.id}")
else:
user = await get_user(user_id)
if not user:
@@ -140,7 +139,7 @@ async def wallet(
status_code=status.HTTP_307_TEMPORARY_REDIRECT,
)
- logger.info(f"Access wallet {wallet_name} of user {user.id}")
+ logger.debug(f"Access wallet {wallet_name}{'of user '+ user.id if user else ''}")
wallet = user.get_wallet(wallet_id)
if not wallet:
return template_renderer().TemplateResponse(
diff --git a/lnbits/core/views/public_api.py b/lnbits/core/views/public_api.py
index 0b84243e..2d2cdd66 100644
--- a/lnbits/core/views/public_api.py
+++ b/lnbits/core/views/public_api.py
@@ -4,11 +4,10 @@ from http import HTTPStatus
from urllib.parse import urlparse
from fastapi import HTTPException
+from loguru import logger
from starlette.requests import Request
from starlette.responses import HTMLResponse
-from loguru import logger
-
from lnbits import bolt11
from .. import core_app
diff --git a/lnbits/db.py b/lnbits/db.py
index bed9397f..66981784 100644
--- a/lnbits/db.py
+++ b/lnbits/db.py
@@ -6,7 +6,6 @@ from contextlib import asynccontextmanager
from typing import Optional
from loguru import logger
-
from sqlalchemy import create_engine
from sqlalchemy_aio.base import AsyncConnection
from sqlalchemy_aio.strategy import ASYNCIO_STRATEGY # type: ignore
diff --git a/lnbits/decorators.py b/lnbits/decorators.py
index d6f73f40..e65b9041 100644
--- a/lnbits/decorators.py
+++ b/lnbits/decorators.py
@@ -14,9 +14,9 @@ from lnbits.core.crud import get_user, get_wallet_for_key
from lnbits.core.models import User, Wallet
from lnbits.requestvars import g
from lnbits.settings import (
- LNBITS_ALLOWED_USERS,
- LNBITS_ADMIN_USERS,
LNBITS_ADMIN_EXTENSIONS,
+ LNBITS_ADMIN_USERS,
+ LNBITS_ALLOWED_USERS,
)
diff --git a/lnbits/extensions/bleskomat/exchange_rates.py b/lnbits/extensions/bleskomat/exchange_rates.py
index dcdaa220..e5eb843f 100644
--- a/lnbits/extensions/bleskomat/exchange_rates.py
+++ b/lnbits/extensions/bleskomat/exchange_rates.py
@@ -1,7 +1,8 @@
-import httpx
import json
import os
+import httpx
+
fiat_currencies = json.load(
open(
os.path.join(
diff --git a/lnbits/extensions/bleskomat/lnurl_api.py b/lnbits/extensions/bleskomat/lnurl_api.py
index 212f9b4a..33e33a70 100644
--- a/lnbits/extensions/bleskomat/lnurl_api.py
+++ b/lnbits/extensions/bleskomat/lnurl_api.py
@@ -3,9 +3,8 @@ import math
import traceback
from http import HTTPStatus
-from starlette.requests import Request
-
from loguru import logger
+from starlette.requests import Request
from . import bleskomat_ext
from .crud import (
diff --git a/lnbits/extensions/bleskomat/models.py b/lnbits/extensions/bleskomat/models.py
index ab952b55..364cbe22 100644
--- a/lnbits/extensions/bleskomat/models.py
+++ b/lnbits/extensions/bleskomat/models.py
@@ -3,13 +3,12 @@ import time
from typing import Dict
from fastapi.params import Query
+from loguru import logger
from pydantic import BaseModel, validator
from starlette.requests import Request
-from loguru import logger
-
from lnbits import bolt11
-from lnbits.core.services import pay_invoice, PaymentFailure
+from lnbits.core.services import PaymentFailure, pay_invoice
from . import db
from .exchange_rates import exchange_rate_providers, fiat_currencies
diff --git a/lnbits/extensions/bleskomat/views_api.py b/lnbits/extensions/bleskomat/views_api.py
index 81efa4ab..e29e3fe7 100644
--- a/lnbits/extensions/bleskomat/views_api.py
+++ b/lnbits/extensions/bleskomat/views_api.py
@@ -1,9 +1,8 @@
from http import HTTPStatus
from fastapi import Depends, Query
-from starlette.exceptions import HTTPException
-
from loguru import logger
+from starlette.exceptions import HTTPException
from lnbits.core.crud import get_user
from lnbits.decorators import WalletTypeInfo, require_admin_key
diff --git a/lnbits/extensions/copilot/models.py b/lnbits/extensions/copilot/models.py
index a279879d..b9b43ccf 100644
--- a/lnbits/extensions/copilot/models.py
+++ b/lnbits/extensions/copilot/models.py
@@ -1,12 +1,14 @@
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
-from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode # type: ignore
-from lnurl.types import LnurlPayMetadata # type: ignore
-from pydantic import BaseModel
import json
from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
+from fastapi.param_functions import Query
+from lnurl.types import LnurlPayMetadata # type: ignore
+from pydantic import BaseModel
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode # type: ignore
class CreateCopilotData(BaseModel):
diff --git a/lnbits/extensions/copilot/tasks.py b/lnbits/extensions/copilot/tasks.py
index 351eb24b..f3c5cff8 100644
--- a/lnbits/extensions/copilot/tasks.py
+++ b/lnbits/extensions/copilot/tasks.py
@@ -25,7 +25,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
webhook = None
data = None
- if "copilot" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "copilot":
# not an copilot invoice
return
diff --git a/lnbits/extensions/discordbot/models.py b/lnbits/extensions/discordbot/models.py
index 985eb096..8b9cd822 100644
--- a/lnbits/extensions/discordbot/models.py
+++ b/lnbits/extensions/discordbot/models.py
@@ -1,8 +1,8 @@
from sqlite3 import Row
+from typing import Optional
from fastapi.param_functions import Query
from pydantic import BaseModel
-from typing import Optional
class CreateUserData(BaseModel):
diff --git a/lnbits/extensions/jukebox/models.py b/lnbits/extensions/jukebox/models.py
index 093961e4..90984b03 100644
--- a/lnbits/extensions/jukebox/models.py
+++ b/lnbits/extensions/jukebox/models.py
@@ -1,9 +1,9 @@
-from typing import NamedTuple
from sqlite3 import Row
+from typing import NamedTuple, Optional
+
from fastapi.param_functions import Query
-from pydantic.main import BaseModel
from pydantic import BaseModel
-from typing import Optional
+from pydantic.main import BaseModel
class CreateJukeLinkData(BaseModel):
diff --git a/lnbits/extensions/jukebox/tasks.py b/lnbits/extensions/jukebox/tasks.py
index 02241c7b..70a2e65d 100644
--- a/lnbits/extensions/jukebox/tasks.py
+++ b/lnbits/extensions/jukebox/tasks.py
@@ -16,7 +16,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "jukebox" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "jukebox":
# not a jukebox invoice
return
await update_jukebox_payment(payment.payment_hash, paid=True)
diff --git a/lnbits/extensions/jukebox/templates/jukebox/index.html b/lnbits/extensions/jukebox/templates/jukebox/index.html
index 9b4efbd5..a67767fb 100644
--- a/lnbits/extensions/jukebox/templates/jukebox/index.html
+++ b/lnbits/extensions/jukebox/templates/jukebox/index.html
@@ -117,7 +117,7 @@
>
@@ -170,16 +170,25 @@
-
+
To use this extension you need a Spotify client ID and client secret.
- You get these by creating an app in the Spotify developers dashboard
-
+
+ here.
+ >Open the Spotify Developer Dashboard
+
-
+
- In the app go to edit-settings, set the redirect URI to this link
+
+ In the app go to edit-settings, set the redirect URI to this link
+
+
+
+ {% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
+ %}
+
+ Click to copy URL
+
{% raw %}{{ locationcb }}{{ jukeboxDialog.data.sp_id }}{% endraw
- %} Click to copy URL
-
-
- Settings can be found
- here.
+ >Open the Spotify Application Settings
+
+
+ After adding the redirect URI, click the "Authorise access" button
+ below.
+
@@ -281,7 +301,7 @@
None:
- if "livestream" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "livestream":
# not a livestream invoice
return
diff --git a/lnbits/extensions/livestream/views.py b/lnbits/extensions/livestream/views.py
index ef035431..97f803a3 100644
--- a/lnbits/extensions/livestream/views.py
+++ b/lnbits/extensions/livestream/views.py
@@ -1,7 +1,5 @@
from http import HTTPStatus
-# from mmap import MAP_DENYWRITE
-
from fastapi.param_functions import Depends
from fastapi.params import Query
from starlette.exceptions import HTTPException
@@ -15,6 +13,8 @@ from lnbits.decorators import check_user_exists
from . import livestream_ext, livestream_renderer
from .crud import get_livestream_by_track, get_track
+# from mmap import MAP_DENYWRITE
+
@livestream_ext.get("/", response_class=HTMLResponse)
async def index(request: Request, user: User = Depends(check_user_exists)):
diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py
index 2b064e0a..e6a1ff48 100644
--- a/lnbits/extensions/lnaddress/lnurl.py
+++ b/lnbits/extensions/lnaddress/lnurl.py
@@ -3,15 +3,13 @@ import json
from datetime import datetime, timedelta
import httpx
-
-from loguru import logger
-
from fastapi.params import Query
from lnurl import ( # type: ignore
LnurlErrorResponse,
LnurlPayActionResponse,
LnurlPayResponse,
)
+from loguru import logger
from starlette.requests import Request
from starlette.responses import HTMLResponse
diff --git a/lnbits/extensions/lnaddress/tasks.py b/lnbits/extensions/lnaddress/tasks.py
index 9702c70b..9abe10c3 100644
--- a/lnbits/extensions/lnaddress/tasks.py
+++ b/lnbits/extensions/lnaddress/tasks.py
@@ -43,13 +43,13 @@ async def call_webhook_on_paid(payment_hash):
async def on_invoice_paid(payment: Payment) -> None:
- if "lnaddress" == payment.extra.get("tag"):
+ if payment.extra.get("tag") == "lnaddress":
await payment.set_pending(False)
await set_address_paid(payment_hash=payment.payment_hash)
await call_webhook_on_paid(payment_hash=payment.payment_hash)
- elif "renew lnaddress" == payment.extra.get("tag"):
+ elif payment.extra.get("tag") == "renew lnaddress":
await payment.set_pending(False)
await set_address_renewed(
diff --git a/lnbits/extensions/lndhub/decorators.py b/lnbits/extensions/lndhub/decorators.py
index 14931164..4698e9b9 100644
--- a/lnbits/extensions/lndhub/decorators.py
+++ b/lnbits/extensions/lndhub/decorators.py
@@ -1,14 +1,12 @@
from base64 import b64decode
-from fastapi.param_functions import Security
-
-from fastapi.security.api_key import APIKeyHeader
from fastapi import Request, status
+from fastapi.param_functions import Security
+from fastapi.security.api_key import APIKeyHeader
from starlette.exceptions import HTTPException
from lnbits.decorators import WalletTypeInfo, get_key_type # type: ignore
-
api_key_header_auth = APIKeyHeader(
name="AUTHORIZATION",
auto_error=False,
diff --git a/lnbits/extensions/lndhub/views.py b/lnbits/extensions/lndhub/views.py
index 4b015c09..38a33a34 100644
--- a/lnbits/extensions/lndhub/views.py
+++ b/lnbits/extensions/lndhub/views.py
@@ -1,8 +1,10 @@
-from lnbits.decorators import check_user_exists
-from . import lndhub_ext, lndhub_renderer
from fastapi import Request
from fastapi.params import Depends
+
from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+
+from . import lndhub_ext, lndhub_renderer
@lndhub_ext.get("/")
diff --git a/lnbits/extensions/lndhub/views_api.py b/lnbits/extensions/lndhub/views_api.py
index 8cbf5b01..a3160fa9 100644
--- a/lnbits/extensions/lndhub/views_api.py
+++ b/lnbits/extensions/lndhub/views_api.py
@@ -1,6 +1,5 @@
-import time
import asyncio
-
+import time
from base64 import urlsafe_b64encode
from http import HTTPStatus
@@ -13,7 +12,7 @@ from lnbits import bolt11
from lnbits.core.crud import delete_expired_invoices, get_payments
from lnbits.core.services import create_invoice, pay_invoice
from lnbits.decorators import WalletTypeInfo
-from lnbits.settings import WALLET, LNBITS_SITE_TITLE
+from lnbits.settings import LNBITS_SITE_TITLE, WALLET
from . import lndhub_ext
from .decorators import check_wallet, require_admin_key
diff --git a/lnbits/extensions/lnticket/crud.py b/lnbits/extensions/lnticket/crud.py
index 8fe17090..3254ad43 100644
--- a/lnbits/extensions/lnticket/crud.py
+++ b/lnbits/extensions/lnticket/crud.py
@@ -1,11 +1,12 @@
-from lnbits.core.models import Wallet
from typing import List, Optional, Union
+import httpx
+
+from lnbits.core.models import Wallet
from lnbits.helpers import urlsafe_short_hash
from . import db
-from .models import CreateFormData, CreateTicketData, Tickets, Forms
-import httpx
+from .models import CreateFormData, CreateTicketData, Forms, Tickets
async def create_ticket(
diff --git a/lnbits/extensions/lnticket/models.py b/lnbits/extensions/lnticket/models.py
index 50ffc1e1..a7a3cf8c 100644
--- a/lnbits/extensions/lnticket/models.py
+++ b/lnbits/extensions/lnticket/models.py
@@ -1,4 +1,5 @@
from typing import Optional
+
from fastapi.param_functions import Query
from pydantic import BaseModel
diff --git a/lnbits/extensions/lnticket/tasks.py b/lnbits/extensions/lnticket/tasks.py
index 23d485b4..7e672115 100644
--- a/lnbits/extensions/lnticket/tasks.py
+++ b/lnbits/extensions/lnticket/tasks.py
@@ -18,7 +18,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "lnticket" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "lnticket":
# not a lnticket invoice
return
diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py
index 26a127f1..5e25dadb 100644
--- a/lnbits/extensions/lnurldevice/lnurl.py
+++ b/lnbits/extensions/lnurldevice/lnurl.py
@@ -1,30 +1,26 @@
import base64
import hashlib
+import hmac
from http import HTTPStatus
+from io import BytesIO
from typing import Optional
-from embit import bech32
-from embit import compact
-import base64
-from io import BytesIO
-import hmac
-
+from embit import bech32, compact
from fastapi import Request
from fastapi.param_functions import Query
from starlette.exceptions import HTTPException
from lnbits.core.services import create_invoice
-from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
from lnbits.core.views.api import pay_invoice
-
+from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
from . import lnurldevice_ext
from .crud import (
create_lnurldevicepayment,
get_lnurldevice,
get_lnurldevicepayment,
- update_lnurldevicepayment,
get_lnurlpayload,
+ update_lnurldevicepayment,
)
diff --git a/lnbits/extensions/lnurldevice/migrations.py b/lnbits/extensions/lnurldevice/migrations.py
index 67065347..c7899282 100644
--- a/lnbits/extensions/lnurldevice/migrations.py
+++ b/lnbits/extensions/lnurldevice/migrations.py
@@ -38,7 +38,7 @@ async def m001_initial(db):
async def m002_redux(db):
"""
- Moves everything from lnurlpos to lnurldevices
+ Moves everything from lnurlpos to lnurldevice
"""
try:
for row in [
diff --git a/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html b/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
index d5b4b5b8..940d4691 100644
--- a/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
+++ b/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
@@ -120,7 +120,7 @@
GET
- /lnurldevice/api/v1/lnurlposs
Headers
{"X-Api-Key": <invoice_key>}
diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py
index c7046588..9cb01fde 100644
--- a/lnbits/extensions/lnurlp/crud.py
+++ b/lnbits/extensions/lnurlp/crud.py
@@ -1,8 +1,9 @@
from typing import List, Optional, Union
from lnbits.db import SQLITE
+
from . import db
-from .models import PayLink, CreatePayLinkData
+from .models import CreatePayLinkData, PayLink
async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink:
diff --git a/lnbits/extensions/lnurlp/models.py b/lnbits/extensions/lnurlp/models.py
index bd121cc8..4bd438a4 100644
--- a/lnbits/extensions/lnurlp/models.py
+++ b/lnbits/extensions/lnurlp/models.py
@@ -1,12 +1,14 @@
import json
-from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult
-from starlette.requests import Request
-from fastapi.param_functions import Query
-from typing import Optional, Dict
-from lnbits.lnurl import encode as lnurl_encode # type: ignore
-from lnurl.types import LnurlPayMetadata # type: ignore
from sqlite3 import Row
+from typing import Dict, Optional
+from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse
+
+from fastapi.param_functions import Query
+from lnurl.types import LnurlPayMetadata # type: ignore
from pydantic import BaseModel
+from starlette.requests import Request
+
+from lnbits.lnurl import encode as lnurl_encode # type: ignore
class CreatePayLinkData(BaseModel):
diff --git a/lnbits/extensions/lnurlp/static/js/index.js b/lnbits/extensions/lnurlp/static/js/index.js
index e18d6161..1713e77f 100644
--- a/lnbits/extensions/lnurlp/static/js/index.js
+++ b/lnbits/extensions/lnurlp/static/js/index.js
@@ -35,6 +35,7 @@ new Vue({
rowsPerPage: 10
}
},
+ nfcTagWriting: false,
formDialog: {
show: false,
fixedAmount: true,
@@ -205,6 +206,42 @@ new Vue({
.catch(err => {
LNbits.utils.notifyApiError(err)
})
+ },
+ writeNfcTag: async function (lnurl) {
+ try {
+ if (typeof NDEFReader == 'undefined') {
+ throw {
+ toString: function () {
+ return 'NFC not supported on this device or browser.'
+ }
+ }
+ }
+
+ const ndef = new NDEFReader()
+
+ this.nfcTagWriting = true
+ this.$q.notify({
+ message: 'Tap your NFC tag to write the LNURL-pay link to it.'
+ })
+
+ await ndef.write({
+ records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}]
+ })
+
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'positive',
+ message: 'NFC tag written successfully.'
+ })
+ } catch (error) {
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'negative',
+ message: error
+ ? error.toString()
+ : 'An unexpected error has occurred.'
+ })
+ }
}
},
created() {
diff --git a/lnbits/extensions/lnurlp/tasks.py b/lnbits/extensions/lnurlp/tasks.py
index b632fa13..525d36ce 100644
--- a/lnbits/extensions/lnurlp/tasks.py
+++ b/lnbits/extensions/lnurlp/tasks.py
@@ -1,5 +1,6 @@
import asyncio
import json
+
import httpx
from lnbits.core import db as core_db
@@ -19,7 +20,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "lnurlp" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "lnurlp":
# not an lnurlp invoice
return
diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/display.html b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
index 08e4de15..944e764b 100644
--- a/lnbits/extensions/lnurlp/templates/lnurlp/display.html
+++ b/lnbits/extensions/lnurlp/templates/lnurlp/display.html
@@ -14,10 +14,17 @@
-
+
Copy LNURL
+
+ >
+
Shareable link
+
+
int:
diff --git a/lnbits/extensions/offlineshop/helpers.py b/lnbits/extensions/offlineshop/helpers.py
index 6b56cf55..86a653aa 100644
--- a/lnbits/extensions/offlineshop/helpers.py
+++ b/lnbits/extensions/offlineshop/helpers.py
@@ -1,6 +1,6 @@
import base64
-import struct
import hmac
+import struct
import time
diff --git a/lnbits/extensions/offlineshop/models.py b/lnbits/extensions/offlineshop/models.py
index 06225351..0128fdb8 100644
--- a/lnbits/extensions/offlineshop/models.py
+++ b/lnbits/extensions/offlineshop/models.py
@@ -1,14 +1,15 @@
-import json
import base64
import hashlib
+import json
from collections import OrderedDict
+from typing import Dict, List, Optional
-from typing import Optional, List, Dict
from lnurl import encode as lnurl_encode # type: ignore
-from lnurl.types import LnurlPayMetadata # type: ignore
from lnurl.models import LnurlPaySuccessAction, UrlAction # type: ignore
+from lnurl.types import LnurlPayMetadata # type: ignore
from pydantic import BaseModel
from starlette.requests import Request
+
from .helpers import totp
shop_counters: Dict = {}
diff --git a/lnbits/extensions/offlineshop/views.py b/lnbits/extensions/offlineshop/views.py
index e1d3a66e..34bb7a03 100644
--- a/lnbits/extensions/offlineshop/views.py
+++ b/lnbits/extensions/offlineshop/views.py
@@ -3,18 +3,18 @@ from datetime import datetime
from http import HTTPStatus
from typing import List
+from fastapi import HTTPException, Request
from fastapi.params import Depends, Query
from starlette.responses import HTMLResponse
-from lnbits.decorators import check_user_exists
-from lnbits.core.models import Payment, User
from lnbits.core.crud import get_standalone_payment
+from lnbits.core.models import Payment, User
from lnbits.core.views.api import api_payment
+from lnbits.decorators import check_user_exists
from . import offlineshop_ext, offlineshop_renderer
-from .models import Item
from .crud import get_item, get_shop
-from fastapi import Request, HTTPException
+from .models import Item
@offlineshop_ext.get("/", response_class=HTMLResponse)
diff --git a/lnbits/extensions/satspay/tasks.py b/lnbits/extensions/satspay/tasks.py
index 7ee6298c..d325405b 100644
--- a/lnbits/extensions/satspay/tasks.py
+++ b/lnbits/extensions/satspay/tasks.py
@@ -19,7 +19,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "charge" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "charge":
# not a charge invoice
return
diff --git a/lnbits/extensions/splitpayments/migrations.py b/lnbits/extensions/splitpayments/migrations.py
index 735afc6c..b3921c42 100644
--- a/lnbits/extensions/splitpayments/migrations.py
+++ b/lnbits/extensions/splitpayments/migrations.py
@@ -14,3 +14,41 @@ async def m001_initial(db):
);
"""
)
+
+
+async def m002_float_percent(db):
+ """
+ Add float percent and migrates the existing data.
+ """
+ await db.execute("ALTER TABLE splitpayments.targets RENAME TO splitpayments_old")
+ await db.execute(
+ """
+ CREATE TABLE splitpayments.targets (
+ wallet TEXT NOT NULL,
+ source TEXT NOT NULL,
+ percent REAL NOT NULL CHECK (percent >= 0 AND percent <= 100),
+ alias TEXT,
+
+ UNIQUE (source, wallet)
+ );
+ """
+ )
+
+ for row in [
+ list(row)
+ for row in await db.fetchall("SELECT * FROM splitpayments.splitpayments_old")
+ ]:
+ await db.execute(
+ """
+ INSERT INTO splitpayments.targets (
+ wallet,
+ source,
+ percent,
+ alias
+ )
+ VALUES (?, ?, ?, ?)
+ """,
+ (row[0], row[1], row[2], row[3]),
+ )
+
+ await db.execute("DROP TABLE splitpayments.splitpayments_old")
diff --git a/lnbits/extensions/splitpayments/models.py b/lnbits/extensions/splitpayments/models.py
index 3264bca7..4b95ed18 100644
--- a/lnbits/extensions/splitpayments/models.py
+++ b/lnbits/extensions/splitpayments/models.py
@@ -7,14 +7,14 @@ from pydantic import BaseModel
class Target(BaseModel):
wallet: str
source: str
- percent: int
+ percent: float
alias: Optional[str]
class TargetPutList(BaseModel):
wallet: str = Query(...)
alias: str = Query("")
- percent: int = Query(..., ge=1)
+ percent: float = Query(..., ge=0.01)
class TargetPut(BaseModel):
diff --git a/lnbits/extensions/splitpayments/static/js/index.js b/lnbits/extensions/splitpayments/static/js/index.js
index d9750bef..5d326231 100644
--- a/lnbits/extensions/splitpayments/static/js/index.js
+++ b/lnbits/extensions/splitpayments/static/js/index.js
@@ -105,7 +105,7 @@ new Vue({
if (currentTotal > 100 && isPercent) {
let diff = (currentTotal - 100) / (100 - this.targets[index].percent)
this.targets.forEach((target, t) => {
- if (t !== index) target.percent -= Math.round(diff * target.percent)
+ if (t !== index) target.percent -= +(diff * target.percent).toFixed(2)
})
}
diff --git a/lnbits/extensions/splitpayments/tasks.py b/lnbits/extensions/splitpayments/tasks.py
index 914e9bd2..0948e849 100644
--- a/lnbits/extensions/splitpayments/tasks.py
+++ b/lnbits/extensions/splitpayments/tasks.py
@@ -22,7 +22,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "splitpayments" == payment.extra.get("tag") or payment.extra.get("splitted"):
+ if payment.extra.get("tag") == "splitpayments" or payment.extra.get("splitted"):
# already splitted, ignore
return
diff --git a/lnbits/extensions/splitpayments/templates/splitpayments/index.html b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
index 1aae4e33..5862abc1 100644
--- a/lnbits/extensions/splitpayments/templates/splitpayments/index.html
+++ b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
@@ -58,14 +58,14 @@
>
-
-
+
+
Clear
-
+
-
+
Save Targets
-
-
+
+
diff --git a/lnbits/extensions/subdomains/cloudflare.py b/lnbits/extensions/subdomains/cloudflare.py
index 8ada2a90..679ca843 100644
--- a/lnbits/extensions/subdomains/cloudflare.py
+++ b/lnbits/extensions/subdomains/cloudflare.py
@@ -1,5 +1,8 @@
+import json
+
+import httpx
+
from lnbits.extensions.subdomains.models import Domains
-import httpx, json
async def cloudflare_create_subdomain(
diff --git a/lnbits/extensions/subdomains/tasks.py b/lnbits/extensions/subdomains/tasks.py
index 75223e82..d8f35161 100644
--- a/lnbits/extensions/subdomains/tasks.py
+++ b/lnbits/extensions/subdomains/tasks.py
@@ -19,7 +19,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "lnsubdomain" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "lnsubdomain":
# not an lnurlp invoice
return
diff --git a/lnbits/extensions/tpos/__init__.py b/lnbits/extensions/tpos/__init__.py
index 1aed95ba..3ce618aa 100644
--- a/lnbits/extensions/tpos/__init__.py
+++ b/lnbits/extensions/tpos/__init__.py
@@ -16,8 +16,8 @@ def tpos_renderer():
from .tasks import wait_for_paid_invoices
-from .views_api import * # noqa
from .views import * # noqa
+from .views_api import * # noqa
def tpos_start():
diff --git a/lnbits/extensions/tpos/tasks.py b/lnbits/extensions/tpos/tasks.py
index 0bb8dff9..01c11428 100644
--- a/lnbits/extensions/tpos/tasks.py
+++ b/lnbits/extensions/tpos/tasks.py
@@ -20,7 +20,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "tpos" == payment.extra.get("tag") and payment.extra.get("tipSplitted"):
+ if payment.extra.get("tag") == "tpos" and payment.extra.get("tipSplitted"):
# already splitted, ignore
return
diff --git a/lnbits/extensions/tpos/views.py b/lnbits/extensions/tpos/views.py
index 21a471c4..e1f1d21e 100644
--- a/lnbits/extensions/tpos/views.py
+++ b/lnbits/extensions/tpos/views.py
@@ -8,10 +8,7 @@ from starlette.responses import HTMLResponse
from lnbits.core.models import User
from lnbits.decorators import check_user_exists
-from lnbits.settings import (
- LNBITS_CUSTOM_LOGO,
- LNBITS_SITE_TITLE,
-)
+from lnbits.settings import LNBITS_CUSTOM_LOGO, LNBITS_SITE_TITLE
from . import tpos_ext, tpos_renderer
from .crud import get_tpos
diff --git a/lnbits/extensions/tpos/views_api.py b/lnbits/extensions/tpos/views_api.py
index 6a4e5c43..9567f98a 100644
--- a/lnbits/extensions/tpos/views_api.py
+++ b/lnbits/extensions/tpos/views_api.py
@@ -2,9 +2,8 @@ from http import HTTPStatus
from fastapi import Query
from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
from loguru import logger
+from starlette.exceptions import HTTPException
from lnbits.core.crud import get_user
from lnbits.core.services import create_invoice
diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py
index 67facec6..15f50e28 100644
--- a/lnbits/extensions/usermanager/models.py
+++ b/lnbits/extensions/usermanager/models.py
@@ -1,8 +1,8 @@
from sqlite3 import Row
+from typing import Optional
from fastapi.param_functions import Query
from pydantic import BaseModel
-from typing import Optional
class CreateUserData(BaseModel):
diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
index a36b36bb..7e7b7653 100644
--- a/lnbits/extensions/usermanager/views_api.py
+++ b/lnbits/extensions/usermanager/views_api.py
@@ -75,7 +75,7 @@ async def api_usermanager_activate_extension(
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
)
- update_user_extension(user_id=userid, extension=extension, active=active)
+ await update_user_extension(user_id=userid, extension=extension, active=active)
return {"extension": "updated"}
diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py
index 05b3908c..18a99599 100644
--- a/lnbits/extensions/withdraw/lnurl.py
+++ b/lnbits/extensions/withdraw/lnurl.py
@@ -1,15 +1,13 @@
import json
import traceback
-import httpx
-
from datetime import datetime
from http import HTTPStatus
-from loguru import logger
-
+import httpx
import shortuuid # type: ignore
from fastapi import HTTPException
from fastapi.param_functions import Query
+from loguru import logger
from starlette.requests import Request
from starlette.responses import HTMLResponse # type: ignore
diff --git a/lnbits/extensions/withdraw/static/js/index.js b/lnbits/extensions/withdraw/static/js/index.js
index e54005c6..3f484deb 100644
--- a/lnbits/extensions/withdraw/static/js/index.js
+++ b/lnbits/extensions/withdraw/static/js/index.js
@@ -53,6 +53,7 @@ new Vue({
rowsPerPage: 10
}
},
+ nfcTagWriting: false,
formDialog: {
show: false,
secondMultiplier: 'seconds',
@@ -231,6 +232,42 @@ new Vue({
})
})
},
+ writeNfcTag: async function (lnurl) {
+ try {
+ if (typeof NDEFReader == 'undefined') {
+ throw {
+ toString: function () {
+ return 'NFC not supported on this device or browser.'
+ }
+ }
+ }
+
+ const ndef = new NDEFReader()
+
+ this.nfcTagWriting = true
+ this.$q.notify({
+ message: 'Tap your NFC tag to write the LNURL-withdraw link to it.'
+ })
+
+ await ndef.write({
+ records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}]
+ })
+
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'positive',
+ message: 'NFC tag written successfully.'
+ })
+ } catch (error) {
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'negative',
+ message: error
+ ? error.toString()
+ : 'An unexpected error has occurred.'
+ })
+ }
+ },
exportCSV: function () {
LNbits.utils.exportCSV(this.paywallsTable.columns, this.paywalls)
}
diff --git a/lnbits/extensions/withdraw/templates/withdraw/display.html b/lnbits/extensions/withdraw/templates/withdraw/display.html
index 5552c77f..1e632741 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/display.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/display.html
@@ -13,14 +13,22 @@
:value="this.here + '/?lightning={{lnurl }}'"
:options="{width: 800}"
class="rounded-borders"
- >
+ >
+
-
+
Copy LNURL
+ b.name
+ const nameA = a.name.toUpperCase()
+ const nameB = b.name.toUpperCase()
+ return nameA < nameB ? -1 : nameA > nameB ? 1 : 0
})
)
+
+ this.g.extensions = extensions
}
}
}
diff --git a/lnbits/tasks.py b/lnbits/tasks.py
index 69aa1906..86863f98 100644
--- a/lnbits/tasks.py
+++ b/lnbits/tasks.py
@@ -1,22 +1,20 @@
-import time
import asyncio
+import time
import traceback
from http import HTTPStatus
-from typing import List, Callable
-
-from loguru import logger
+from typing import Callable, List
from fastapi.exceptions import HTTPException
+from loguru import logger
-from lnbits.settings import WALLET
from lnbits.core.crud import (
- get_payments,
- get_standalone_payment,
delete_expired_invoices,
get_balance_checks,
+ get_payments,
+ get_standalone_payment,
)
from lnbits.core.services import redeem_lnurl_withdraw
-
+from lnbits.settings import WALLET
deferred_async: List[Callable] = []
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 6ab1ec84..acca92e7 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -228,7 +228,6 @@
+
+
+
+
To use this extension you need a Spotify client ID and client secret.
- You get these by creating an app in the Spotify developers dashboard
-
+ +
- In the app go to edit-settings, set the redirect URI to this link
+ + In the app go to edit-settings, set the redirect URI to this link +
+- Settings can be found - here. + >Open the Spotify Application Settings +
+
+ After adding the redirect URI, click the "Authorise access" button + below. +
@@ -281,7 +301,7 @@
None:
- if "livestream" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "livestream":
# not a livestream invoice
return
diff --git a/lnbits/extensions/livestream/views.py b/lnbits/extensions/livestream/views.py
index ef035431..97f803a3 100644
--- a/lnbits/extensions/livestream/views.py
+++ b/lnbits/extensions/livestream/views.py
@@ -1,7 +1,5 @@
from http import HTTPStatus
-# from mmap import MAP_DENYWRITE
-
from fastapi.param_functions import Depends
from fastapi.params import Query
from starlette.exceptions import HTTPException
@@ -15,6 +13,8 @@ from lnbits.decorators import check_user_exists
from . import livestream_ext, livestream_renderer
from .crud import get_livestream_by_track, get_track
+# from mmap import MAP_DENYWRITE
+
@livestream_ext.get("/", response_class=HTMLResponse)
async def index(request: Request, user: User = Depends(check_user_exists)):
diff --git a/lnbits/extensions/lnaddress/lnurl.py b/lnbits/extensions/lnaddress/lnurl.py
index 2b064e0a..e6a1ff48 100644
--- a/lnbits/extensions/lnaddress/lnurl.py
+++ b/lnbits/extensions/lnaddress/lnurl.py
@@ -3,15 +3,13 @@ import json
from datetime import datetime, timedelta
import httpx
-
-from loguru import logger
-
from fastapi.params import Query
from lnurl import ( # type: ignore
LnurlErrorResponse,
LnurlPayActionResponse,
LnurlPayResponse,
)
+from loguru import logger
from starlette.requests import Request
from starlette.responses import HTMLResponse
diff --git a/lnbits/extensions/lnaddress/tasks.py b/lnbits/extensions/lnaddress/tasks.py
index 9702c70b..9abe10c3 100644
--- a/lnbits/extensions/lnaddress/tasks.py
+++ b/lnbits/extensions/lnaddress/tasks.py
@@ -43,13 +43,13 @@ async def call_webhook_on_paid(payment_hash):
async def on_invoice_paid(payment: Payment) -> None:
- if "lnaddress" == payment.extra.get("tag"):
+ if payment.extra.get("tag") == "lnaddress":
await payment.set_pending(False)
await set_address_paid(payment_hash=payment.payment_hash)
await call_webhook_on_paid(payment_hash=payment.payment_hash)
- elif "renew lnaddress" == payment.extra.get("tag"):
+ elif payment.extra.get("tag") == "renew lnaddress":
await payment.set_pending(False)
await set_address_renewed(
diff --git a/lnbits/extensions/lndhub/decorators.py b/lnbits/extensions/lndhub/decorators.py
index 14931164..4698e9b9 100644
--- a/lnbits/extensions/lndhub/decorators.py
+++ b/lnbits/extensions/lndhub/decorators.py
@@ -1,14 +1,12 @@
from base64 import b64decode
-from fastapi.param_functions import Security
-
-from fastapi.security.api_key import APIKeyHeader
from fastapi import Request, status
+from fastapi.param_functions import Security
+from fastapi.security.api_key import APIKeyHeader
from starlette.exceptions import HTTPException
from lnbits.decorators import WalletTypeInfo, get_key_type # type: ignore
-
api_key_header_auth = APIKeyHeader(
name="AUTHORIZATION",
auto_error=False,
diff --git a/lnbits/extensions/lndhub/views.py b/lnbits/extensions/lndhub/views.py
index 4b015c09..38a33a34 100644
--- a/lnbits/extensions/lndhub/views.py
+++ b/lnbits/extensions/lndhub/views.py
@@ -1,8 +1,10 @@
-from lnbits.decorators import check_user_exists
-from . import lndhub_ext, lndhub_renderer
from fastapi import Request
from fastapi.params import Depends
+
from lnbits.core.models import User
+from lnbits.decorators import check_user_exists
+
+from . import lndhub_ext, lndhub_renderer
@lndhub_ext.get("/")
diff --git a/lnbits/extensions/lndhub/views_api.py b/lnbits/extensions/lndhub/views_api.py
index 8cbf5b01..a3160fa9 100644
--- a/lnbits/extensions/lndhub/views_api.py
+++ b/lnbits/extensions/lndhub/views_api.py
@@ -1,6 +1,5 @@
-import time
import asyncio
-
+import time
from base64 import urlsafe_b64encode
from http import HTTPStatus
@@ -13,7 +12,7 @@ from lnbits import bolt11
from lnbits.core.crud import delete_expired_invoices, get_payments
from lnbits.core.services import create_invoice, pay_invoice
from lnbits.decorators import WalletTypeInfo
-from lnbits.settings import WALLET, LNBITS_SITE_TITLE
+from lnbits.settings import LNBITS_SITE_TITLE, WALLET
from . import lndhub_ext
from .decorators import check_wallet, require_admin_key
diff --git a/lnbits/extensions/lnticket/crud.py b/lnbits/extensions/lnticket/crud.py
index 8fe17090..3254ad43 100644
--- a/lnbits/extensions/lnticket/crud.py
+++ b/lnbits/extensions/lnticket/crud.py
@@ -1,11 +1,12 @@
-from lnbits.core.models import Wallet
from typing import List, Optional, Union
+import httpx
+
+from lnbits.core.models import Wallet
from lnbits.helpers import urlsafe_short_hash
from . import db
-from .models import CreateFormData, CreateTicketData, Tickets, Forms
-import httpx
+from .models import CreateFormData, CreateTicketData, Forms, Tickets
async def create_ticket(
diff --git a/lnbits/extensions/lnticket/models.py b/lnbits/extensions/lnticket/models.py
index 50ffc1e1..a7a3cf8c 100644
--- a/lnbits/extensions/lnticket/models.py
+++ b/lnbits/extensions/lnticket/models.py
@@ -1,4 +1,5 @@
from typing import Optional
+
from fastapi.param_functions import Query
from pydantic import BaseModel
diff --git a/lnbits/extensions/lnticket/tasks.py b/lnbits/extensions/lnticket/tasks.py
index 23d485b4..7e672115 100644
--- a/lnbits/extensions/lnticket/tasks.py
+++ b/lnbits/extensions/lnticket/tasks.py
@@ -18,7 +18,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "lnticket" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "lnticket":
# not a lnticket invoice
return
diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py
index 26a127f1..5e25dadb 100644
--- a/lnbits/extensions/lnurldevice/lnurl.py
+++ b/lnbits/extensions/lnurldevice/lnurl.py
@@ -1,30 +1,26 @@
import base64
import hashlib
+import hmac
from http import HTTPStatus
+from io import BytesIO
from typing import Optional
-from embit import bech32
-from embit import compact
-import base64
-from io import BytesIO
-import hmac
-
+from embit import bech32, compact
from fastapi import Request
from fastapi.param_functions import Query
from starlette.exceptions import HTTPException
from lnbits.core.services import create_invoice
-from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
from lnbits.core.views.api import pay_invoice
-
+from lnbits.utils.exchange_rates import fiat_amount_as_satoshis
from . import lnurldevice_ext
from .crud import (
create_lnurldevicepayment,
get_lnurldevice,
get_lnurldevicepayment,
- update_lnurldevicepayment,
get_lnurlpayload,
+ update_lnurldevicepayment,
)
diff --git a/lnbits/extensions/lnurldevice/migrations.py b/lnbits/extensions/lnurldevice/migrations.py
index 67065347..c7899282 100644
--- a/lnbits/extensions/lnurldevice/migrations.py
+++ b/lnbits/extensions/lnurldevice/migrations.py
@@ -38,7 +38,7 @@ async def m001_initial(db):
async def m002_redux(db):
"""
- Moves everything from lnurlpos to lnurldevices
+ Moves everything from lnurlpos to lnurldevice
"""
try:
for row in [
diff --git a/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html b/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
index d5b4b5b8..940d4691 100644
--- a/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
+++ b/lnbits/extensions/lnurldevice/templates/lnurldevice/_api_docs.html
@@ -120,7 +120,7 @@
diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py index c7046588..9cb01fde 100644 --- a/lnbits/extensions/lnurlp/crud.py +++ b/lnbits/extensions/lnurlp/crud.py @@ -1,8 +1,9 @@ from typing import List, Optional, Union from lnbits.db import SQLITE + from . import db -from .models import PayLink, CreatePayLinkData +from .models import CreatePayLinkData, PayLink async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink: diff --git a/lnbits/extensions/lnurlp/models.py b/lnbits/extensions/lnurlp/models.py index bd121cc8..4bd438a4 100644 --- a/lnbits/extensions/lnurlp/models.py +++ b/lnbits/extensions/lnurlp/models.py @@ -1,12 +1,14 @@ import json -from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult -from starlette.requests import Request -from fastapi.param_functions import Query -from typing import Optional, Dict -from lnbits.lnurl import encode as lnurl_encode # type: ignore -from lnurl.types import LnurlPayMetadata # type: ignore from sqlite3 import Row +from typing import Dict, Optional +from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse + +from fastapi.param_functions import Query +from lnurl.types import LnurlPayMetadata # type: ignore from pydantic import BaseModel +from starlette.requests import Request + +from lnbits.lnurl import encode as lnurl_encode # type: ignore class CreatePayLinkData(BaseModel): diff --git a/lnbits/extensions/lnurlp/static/js/index.js b/lnbits/extensions/lnurlp/static/js/index.js index e18d6161..1713e77f 100644 --- a/lnbits/extensions/lnurlp/static/js/index.js +++ b/lnbits/extensions/lnurlp/static/js/index.js @@ -35,6 +35,7 @@ new Vue({ rowsPerPage: 10 } }, + nfcTagWriting: false, formDialog: { show: false, fixedAmount: true, @@ -205,6 +206,42 @@ new Vue({ .catch(err => { LNbits.utils.notifyApiError(err) }) + }, + writeNfcTag: async function (lnurl) { + try { + if (typeof NDEFReader == 'undefined') { + throw { + toString: function () { + return 'NFC not supported on this device or browser.' + } + } + } + + const ndef = new NDEFReader() + + this.nfcTagWriting = true + this.$q.notify({ + message: 'Tap your NFC tag to write the LNURL-pay link to it.' + }) + + await ndef.write({ + records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}] + }) + + this.nfcTagWriting = false + this.$q.notify({ + type: 'positive', + message: 'NFC tag written successfully.' + }) + } catch (error) { + this.nfcTagWriting = false + this.$q.notify({ + type: 'negative', + message: error + ? error.toString() + : 'An unexpected error has occurred.' + }) + } } }, created() { diff --git a/lnbits/extensions/lnurlp/tasks.py b/lnbits/extensions/lnurlp/tasks.py index b632fa13..525d36ce 100644 --- a/lnbits/extensions/lnurlp/tasks.py +++ b/lnbits/extensions/lnurlp/tasks.py @@ -1,5 +1,6 @@ import asyncio import json + import httpx from lnbits.core import db as core_db @@ -19,7 +20,7 @@ async def wait_for_paid_invoices(): async def on_invoice_paid(payment: Payment) -> None: - if "lnurlp" != payment.extra.get("tag"): + if payment.extra.get("tag") != "lnurlp": # not an lnurlp invoice return diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/display.html b/lnbits/extensions/lnurlp/templates/lnurlp/display.html index 08e4de15..944e764b 100644 --- a/lnbits/extensions/lnurlp/templates/lnurlp/display.html +++ b/lnbits/extensions/lnurlp/templates/lnurlp/display.html @@ -14,10 +14,17 @@
- GET
- /lnurldevice/api/v1/lnurlposs
Headers
{"X-Api-Key": <invoice_key>}diff --git a/lnbits/extensions/lnurlp/crud.py b/lnbits/extensions/lnurlp/crud.py index c7046588..9cb01fde 100644 --- a/lnbits/extensions/lnurlp/crud.py +++ b/lnbits/extensions/lnurlp/crud.py @@ -1,8 +1,9 @@ from typing import List, Optional, Union from lnbits.db import SQLITE + from . import db -from .models import PayLink, CreatePayLinkData +from .models import CreatePayLinkData, PayLink async def create_pay_link(data: CreatePayLinkData, wallet_id: str) -> PayLink: diff --git a/lnbits/extensions/lnurlp/models.py b/lnbits/extensions/lnurlp/models.py index bd121cc8..4bd438a4 100644 --- a/lnbits/extensions/lnurlp/models.py +++ b/lnbits/extensions/lnurlp/models.py @@ -1,12 +1,14 @@ import json -from urllib.parse import urlparse, urlunparse, parse_qs, urlencode, ParseResult -from starlette.requests import Request -from fastapi.param_functions import Query -from typing import Optional, Dict -from lnbits.lnurl import encode as lnurl_encode # type: ignore -from lnurl.types import LnurlPayMetadata # type: ignore from sqlite3 import Row +from typing import Dict, Optional +from urllib.parse import ParseResult, parse_qs, urlencode, urlparse, urlunparse + +from fastapi.param_functions import Query +from lnurl.types import LnurlPayMetadata # type: ignore from pydantic import BaseModel +from starlette.requests import Request + +from lnbits.lnurl import encode as lnurl_encode # type: ignore class CreatePayLinkData(BaseModel): diff --git a/lnbits/extensions/lnurlp/static/js/index.js b/lnbits/extensions/lnurlp/static/js/index.js index e18d6161..1713e77f 100644 --- a/lnbits/extensions/lnurlp/static/js/index.js +++ b/lnbits/extensions/lnurlp/static/js/index.js @@ -35,6 +35,7 @@ new Vue({ rowsPerPage: 10 } }, + nfcTagWriting: false, formDialog: { show: false, fixedAmount: true, @@ -205,6 +206,42 @@ new Vue({ .catch(err => { LNbits.utils.notifyApiError(err) }) + }, + writeNfcTag: async function (lnurl) { + try { + if (typeof NDEFReader == 'undefined') { + throw { + toString: function () { + return 'NFC not supported on this device or browser.' + } + } + } + + const ndef = new NDEFReader() + + this.nfcTagWriting = true + this.$q.notify({ + message: 'Tap your NFC tag to write the LNURL-pay link to it.' + }) + + await ndef.write({ + records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}] + }) + + this.nfcTagWriting = false + this.$q.notify({ + type: 'positive', + message: 'NFC tag written successfully.' + }) + } catch (error) { + this.nfcTagWriting = false + this.$q.notify({ + type: 'negative', + message: error + ? error.toString() + : 'An unexpected error has occurred.' + }) + } } }, created() { diff --git a/lnbits/extensions/lnurlp/tasks.py b/lnbits/extensions/lnurlp/tasks.py index b632fa13..525d36ce 100644 --- a/lnbits/extensions/lnurlp/tasks.py +++ b/lnbits/extensions/lnurlp/tasks.py @@ -1,5 +1,6 @@ import asyncio import json + import httpx from lnbits.core import db as core_db @@ -19,7 +20,7 @@ async def wait_for_paid_invoices(): async def on_invoice_paid(payment: Payment) -> None: - if "lnurlp" != payment.extra.get("tag"): + if payment.extra.get("tag") != "lnurlp": # not an lnurlp invoice return diff --git a/lnbits/extensions/lnurlp/templates/lnurlp/display.html b/lnbits/extensions/lnurlp/templates/lnurlp/display.html index 08e4de15..944e764b 100644 --- a/lnbits/extensions/lnurlp/templates/lnurlp/display.html +++ b/lnbits/extensions/lnurlp/templates/lnurlp/display.html @@ -14,10 +14,17 @@
+
Copy LNURL
+
+ >
+
@@ -200,7 +203,8 @@
type="number"
label="Comment maximum characters"
hint="Tell wallets to prompt users for a comment that will be sent along with the payment. LNURLp will store the comment and send it in the webhook."
- >
+ >
+
Shareable link
+
+
int:
diff --git a/lnbits/extensions/offlineshop/helpers.py b/lnbits/extensions/offlineshop/helpers.py
index 6b56cf55..86a653aa 100644
--- a/lnbits/extensions/offlineshop/helpers.py
+++ b/lnbits/extensions/offlineshop/helpers.py
@@ -1,6 +1,6 @@
import base64
-import struct
import hmac
+import struct
import time
diff --git a/lnbits/extensions/offlineshop/models.py b/lnbits/extensions/offlineshop/models.py
index 06225351..0128fdb8 100644
--- a/lnbits/extensions/offlineshop/models.py
+++ b/lnbits/extensions/offlineshop/models.py
@@ -1,14 +1,15 @@
-import json
import base64
import hashlib
+import json
from collections import OrderedDict
+from typing import Dict, List, Optional
-from typing import Optional, List, Dict
from lnurl import encode as lnurl_encode # type: ignore
-from lnurl.types import LnurlPayMetadata # type: ignore
from lnurl.models import LnurlPaySuccessAction, UrlAction # type: ignore
+from lnurl.types import LnurlPayMetadata # type: ignore
from pydantic import BaseModel
from starlette.requests import Request
+
from .helpers import totp
shop_counters: Dict = {}
diff --git a/lnbits/extensions/offlineshop/views.py b/lnbits/extensions/offlineshop/views.py
index e1d3a66e..34bb7a03 100644
--- a/lnbits/extensions/offlineshop/views.py
+++ b/lnbits/extensions/offlineshop/views.py
@@ -3,18 +3,18 @@ from datetime import datetime
from http import HTTPStatus
from typing import List
+from fastapi import HTTPException, Request
from fastapi.params import Depends, Query
from starlette.responses import HTMLResponse
-from lnbits.decorators import check_user_exists
-from lnbits.core.models import Payment, User
from lnbits.core.crud import get_standalone_payment
+from lnbits.core.models import Payment, User
from lnbits.core.views.api import api_payment
+from lnbits.decorators import check_user_exists
from . import offlineshop_ext, offlineshop_renderer
-from .models import Item
from .crud import get_item, get_shop
-from fastapi import Request, HTTPException
+from .models import Item
@offlineshop_ext.get("/", response_class=HTMLResponse)
diff --git a/lnbits/extensions/satspay/tasks.py b/lnbits/extensions/satspay/tasks.py
index 7ee6298c..d325405b 100644
--- a/lnbits/extensions/satspay/tasks.py
+++ b/lnbits/extensions/satspay/tasks.py
@@ -19,7 +19,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "charge" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "charge":
# not a charge invoice
return
diff --git a/lnbits/extensions/splitpayments/migrations.py b/lnbits/extensions/splitpayments/migrations.py
index 735afc6c..b3921c42 100644
--- a/lnbits/extensions/splitpayments/migrations.py
+++ b/lnbits/extensions/splitpayments/migrations.py
@@ -14,3 +14,41 @@ async def m001_initial(db):
);
"""
)
+
+
+async def m002_float_percent(db):
+ """
+ Add float percent and migrates the existing data.
+ """
+ await db.execute("ALTER TABLE splitpayments.targets RENAME TO splitpayments_old")
+ await db.execute(
+ """
+ CREATE TABLE splitpayments.targets (
+ wallet TEXT NOT NULL,
+ source TEXT NOT NULL,
+ percent REAL NOT NULL CHECK (percent >= 0 AND percent <= 100),
+ alias TEXT,
+
+ UNIQUE (source, wallet)
+ );
+ """
+ )
+
+ for row in [
+ list(row)
+ for row in await db.fetchall("SELECT * FROM splitpayments.splitpayments_old")
+ ]:
+ await db.execute(
+ """
+ INSERT INTO splitpayments.targets (
+ wallet,
+ source,
+ percent,
+ alias
+ )
+ VALUES (?, ?, ?, ?)
+ """,
+ (row[0], row[1], row[2], row[3]),
+ )
+
+ await db.execute("DROP TABLE splitpayments.splitpayments_old")
diff --git a/lnbits/extensions/splitpayments/models.py b/lnbits/extensions/splitpayments/models.py
index 3264bca7..4b95ed18 100644
--- a/lnbits/extensions/splitpayments/models.py
+++ b/lnbits/extensions/splitpayments/models.py
@@ -7,14 +7,14 @@ from pydantic import BaseModel
class Target(BaseModel):
wallet: str
source: str
- percent: int
+ percent: float
alias: Optional[str]
class TargetPutList(BaseModel):
wallet: str = Query(...)
alias: str = Query("")
- percent: int = Query(..., ge=1)
+ percent: float = Query(..., ge=0.01)
class TargetPut(BaseModel):
diff --git a/lnbits/extensions/splitpayments/static/js/index.js b/lnbits/extensions/splitpayments/static/js/index.js
index d9750bef..5d326231 100644
--- a/lnbits/extensions/splitpayments/static/js/index.js
+++ b/lnbits/extensions/splitpayments/static/js/index.js
@@ -105,7 +105,7 @@ new Vue({
if (currentTotal > 100 && isPercent) {
let diff = (currentTotal - 100) / (100 - this.targets[index].percent)
this.targets.forEach((target, t) => {
- if (t !== index) target.percent -= Math.round(diff * target.percent)
+ if (t !== index) target.percent -= +(diff * target.percent).toFixed(2)
})
}
diff --git a/lnbits/extensions/splitpayments/tasks.py b/lnbits/extensions/splitpayments/tasks.py
index 914e9bd2..0948e849 100644
--- a/lnbits/extensions/splitpayments/tasks.py
+++ b/lnbits/extensions/splitpayments/tasks.py
@@ -22,7 +22,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "splitpayments" == payment.extra.get("tag") or payment.extra.get("splitted"):
+ if payment.extra.get("tag") == "splitpayments" or payment.extra.get("splitted"):
# already splitted, ignore
return
diff --git a/lnbits/extensions/splitpayments/templates/splitpayments/index.html b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
index 1aae4e33..5862abc1 100644
--- a/lnbits/extensions/splitpayments/templates/splitpayments/index.html
+++ b/lnbits/extensions/splitpayments/templates/splitpayments/index.html
@@ -58,14 +58,14 @@
>
-
-
+
-
+
Clear
-
+
-
+
Save Targets
-
-
+
+
diff --git a/lnbits/extensions/subdomains/cloudflare.py b/lnbits/extensions/subdomains/cloudflare.py
index 8ada2a90..679ca843 100644
--- a/lnbits/extensions/subdomains/cloudflare.py
+++ b/lnbits/extensions/subdomains/cloudflare.py
@@ -1,5 +1,8 @@
+import json
+
+import httpx
+
from lnbits.extensions.subdomains.models import Domains
-import httpx, json
async def cloudflare_create_subdomain(
diff --git a/lnbits/extensions/subdomains/tasks.py b/lnbits/extensions/subdomains/tasks.py
index 75223e82..d8f35161 100644
--- a/lnbits/extensions/subdomains/tasks.py
+++ b/lnbits/extensions/subdomains/tasks.py
@@ -19,7 +19,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "lnsubdomain" != payment.extra.get("tag"):
+ if payment.extra.get("tag") != "lnsubdomain":
# not an lnurlp invoice
return
diff --git a/lnbits/extensions/tpos/__init__.py b/lnbits/extensions/tpos/__init__.py
index 1aed95ba..3ce618aa 100644
--- a/lnbits/extensions/tpos/__init__.py
+++ b/lnbits/extensions/tpos/__init__.py
@@ -16,8 +16,8 @@ def tpos_renderer():
from .tasks import wait_for_paid_invoices
-from .views_api import * # noqa
from .views import * # noqa
+from .views_api import * # noqa
def tpos_start():
diff --git a/lnbits/extensions/tpos/tasks.py b/lnbits/extensions/tpos/tasks.py
index 0bb8dff9..01c11428 100644
--- a/lnbits/extensions/tpos/tasks.py
+++ b/lnbits/extensions/tpos/tasks.py
@@ -20,7 +20,7 @@ async def wait_for_paid_invoices():
async def on_invoice_paid(payment: Payment) -> None:
- if "tpos" == payment.extra.get("tag") and payment.extra.get("tipSplitted"):
+ if payment.extra.get("tag") == "tpos" and payment.extra.get("tipSplitted"):
# already splitted, ignore
return
diff --git a/lnbits/extensions/tpos/views.py b/lnbits/extensions/tpos/views.py
index 21a471c4..e1f1d21e 100644
--- a/lnbits/extensions/tpos/views.py
+++ b/lnbits/extensions/tpos/views.py
@@ -8,10 +8,7 @@ from starlette.responses import HTMLResponse
from lnbits.core.models import User
from lnbits.decorators import check_user_exists
-from lnbits.settings import (
- LNBITS_CUSTOM_LOGO,
- LNBITS_SITE_TITLE,
-)
+from lnbits.settings import LNBITS_CUSTOM_LOGO, LNBITS_SITE_TITLE
from . import tpos_ext, tpos_renderer
from .crud import get_tpos
diff --git a/lnbits/extensions/tpos/views_api.py b/lnbits/extensions/tpos/views_api.py
index 6a4e5c43..9567f98a 100644
--- a/lnbits/extensions/tpos/views_api.py
+++ b/lnbits/extensions/tpos/views_api.py
@@ -2,9 +2,8 @@ from http import HTTPStatus
from fastapi import Query
from fastapi.params import Depends
-from starlette.exceptions import HTTPException
-
from loguru import logger
+from starlette.exceptions import HTTPException
from lnbits.core.crud import get_user
from lnbits.core.services import create_invoice
diff --git a/lnbits/extensions/usermanager/models.py b/lnbits/extensions/usermanager/models.py
index 67facec6..15f50e28 100644
--- a/lnbits/extensions/usermanager/models.py
+++ b/lnbits/extensions/usermanager/models.py
@@ -1,8 +1,8 @@
from sqlite3 import Row
+from typing import Optional
from fastapi.param_functions import Query
from pydantic import BaseModel
-from typing import Optional
class CreateUserData(BaseModel):
diff --git a/lnbits/extensions/usermanager/views_api.py b/lnbits/extensions/usermanager/views_api.py
index a36b36bb..7e7b7653 100644
--- a/lnbits/extensions/usermanager/views_api.py
+++ b/lnbits/extensions/usermanager/views_api.py
@@ -75,7 +75,7 @@ async def api_usermanager_activate_extension(
raise HTTPException(
status_code=HTTPStatus.NOT_FOUND, detail="User does not exist."
)
- update_user_extension(user_id=userid, extension=extension, active=active)
+ await update_user_extension(user_id=userid, extension=extension, active=active)
return {"extension": "updated"}
diff --git a/lnbits/extensions/withdraw/lnurl.py b/lnbits/extensions/withdraw/lnurl.py
index 05b3908c..18a99599 100644
--- a/lnbits/extensions/withdraw/lnurl.py
+++ b/lnbits/extensions/withdraw/lnurl.py
@@ -1,15 +1,13 @@
import json
import traceback
-import httpx
-
from datetime import datetime
from http import HTTPStatus
-from loguru import logger
-
+import httpx
import shortuuid # type: ignore
from fastapi import HTTPException
from fastapi.param_functions import Query
+from loguru import logger
from starlette.requests import Request
from starlette.responses import HTMLResponse # type: ignore
diff --git a/lnbits/extensions/withdraw/static/js/index.js b/lnbits/extensions/withdraw/static/js/index.js
index e54005c6..3f484deb 100644
--- a/lnbits/extensions/withdraw/static/js/index.js
+++ b/lnbits/extensions/withdraw/static/js/index.js
@@ -53,6 +53,7 @@ new Vue({
rowsPerPage: 10
}
},
+ nfcTagWriting: false,
formDialog: {
show: false,
secondMultiplier: 'seconds',
@@ -231,6 +232,42 @@ new Vue({
})
})
},
+ writeNfcTag: async function (lnurl) {
+ try {
+ if (typeof NDEFReader == 'undefined') {
+ throw {
+ toString: function () {
+ return 'NFC not supported on this device or browser.'
+ }
+ }
+ }
+
+ const ndef = new NDEFReader()
+
+ this.nfcTagWriting = true
+ this.$q.notify({
+ message: 'Tap your NFC tag to write the LNURL-withdraw link to it.'
+ })
+
+ await ndef.write({
+ records: [{recordType: 'url', data: 'lightning:' + lnurl, lang: 'en'}]
+ })
+
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'positive',
+ message: 'NFC tag written successfully.'
+ })
+ } catch (error) {
+ this.nfcTagWriting = false
+ this.$q.notify({
+ type: 'negative',
+ message: error
+ ? error.toString()
+ : 'An unexpected error has occurred.'
+ })
+ }
+ },
exportCSV: function () {
LNbits.utils.exportCSV(this.paywallsTable.columns, this.paywalls)
}
diff --git a/lnbits/extensions/withdraw/templates/withdraw/display.html b/lnbits/extensions/withdraw/templates/withdraw/display.html
index 5552c77f..1e632741 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/display.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/display.html
@@ -13,14 +13,22 @@
:value="this.here + '/?lightning={{lnurl }}'"
:options="{width: 800}"
class="rounded-borders"
- >
+ >
+
+
Copy LNURL
+ b.name
+ const nameA = a.name.toUpperCase()
+ const nameB = b.name.toUpperCase()
+ return nameA < nameB ? -1 : nameA > nameB ? 1 : 0
})
)
+
+ this.g.extensions = extensions
}
}
}
diff --git a/lnbits/tasks.py b/lnbits/tasks.py
index 69aa1906..86863f98 100644
--- a/lnbits/tasks.py
+++ b/lnbits/tasks.py
@@ -1,22 +1,20 @@
-import time
import asyncio
+import time
import traceback
from http import HTTPStatus
-from typing import List, Callable
-
-from loguru import logger
+from typing import Callable, List
from fastapi.exceptions import HTTPException
+from loguru import logger
-from lnbits.settings import WALLET
from lnbits.core.crud import (
- get_payments,
- get_standalone_payment,
delete_expired_invoices,
get_balance_checks,
+ get_payments,
+ get_standalone_payment,
)
from lnbits.core.services import redeem_lnurl_withdraw
-
+from lnbits.settings import WALLET
deferred_async: List[Callable] = []
diff --git a/lnbits/templates/base.html b/lnbits/templates/base.html
index 6ab1ec84..acca92e7 100644
--- a/lnbits/templates/base.html
+++ b/lnbits/templates/base.html
@@ -228,7 +228,6 @@