From 680b035ec95ae51d0c03ad90861055414190c669 Mon Sep 17 00:00:00 2001 From: Arc <33088785+arcbtc@users.noreply.github.com> Date: Thu, 7 May 2026 12:31:32 +0100 Subject: [PATCH] feat: add fiat checkout and nostr + email notification (#50) * feat: fiat and email/nostr notifications * make n bake --- migrations.py | 10 ++++ models.py | 20 ++++++- services.py | 86 +++++++++++++++++++++++++++++ static/js/display.js | 58 ++++++++++++++------ static/js/display.vue | 123 ++++++++++++++++++++++++++++++++---------- static/js/index.js | 25 +++++++-- static/js/index.vue | 27 ++++++++++ tasks.py | 3 +- views_api.py | 88 ++++++++++++++++++++++++++---- 9 files changed, 379 insertions(+), 61 deletions(-) diff --git a/migrations.py b/migrations.py index 6f8e838..a7e3e86 100644 --- a/migrations.py +++ b/migrations.py @@ -175,3 +175,13 @@ async def m006_add_extra_fields(db): # Add 'extra' column to ticket table await db.execute("ALTER TABLE events.ticket ADD COLUMN extra TEXT;") + + +async def m007_add_allow_fiat(db): + """ + Add an allow_fiat column so event owners can explicitly enable fiat checkout. + """ + await db.execute(""" + ALTER TABLE events.events + ADD COLUMN allow_fiat BOOLEAN NOT NULL DEFAULT FALSE; + """) diff --git a/models.py b/models.py index 14547d1..7886600 100644 --- a/models.py +++ b/models.py @@ -24,6 +24,8 @@ class EventExtra(BaseModel): promo_codes: list[PromoCode] = Field(default_factory=list) conditional: bool = False min_tickets: int = 1 + email_notifications: bool = False + nostr_notifications: bool = False class CreateEvent(BaseModel): @@ -34,6 +36,7 @@ class CreateEvent(BaseModel): event_start_date: str event_end_date: str currency: str = "sat" + allow_fiat: bool = False amount_tickets: int = Query(..., ge=0) price_per_ticket: float = Query(..., ge=0) banner: str | None = None @@ -50,6 +53,7 @@ class Event(BaseModel): event_start_date: str event_end_date: str currency: str + allow_fiat: bool = False amount_tickets: int price_per_ticket: float time: datetime @@ -66,13 +70,21 @@ class PublicEvent(BaseModel): canceled: bool event_start_date: str event_end_date: str + currency: str + allow_fiat: bool = False + price_per_ticket: float banner: str | None + extra: EventExtra = Field(default_factory=EventExtra) class TicketExtra(BaseModel): applied_promo_code: str | None = None sats_paid: int | None = None refund_address: str | None = None + nostr_identifier: str | None = None + ticket_base_url: str | None = None + email_notification_sent: bool = False + nostr_notification_sent: bool = False refunded: bool = False @@ -81,6 +93,9 @@ class CreateTicket(BaseModel): email: EmailStr promo_code: str | None = None refund_address: str | None = None + nostr_identifier: str | None = None + payment_method: str | None = None + fiat_provider: str | None = None class Ticket(BaseModel): @@ -107,4 +122,7 @@ class PublicTicket(BaseModel): class TicketPaymentRequest(BaseModel): payment_hash: str - payment_request: str + payment_request: str | None = None + fiat_payment_request: str | None = None + fiat_provider: str | None = None + is_fiat: bool = False diff --git a/services.py b/services.py index 9099ef0..60626fd 100644 --- a/services.py +++ b/services.py @@ -1,3 +1,12 @@ +from __future__ import annotations + +from asyncio.tasks import create_task + +from lnbits.core.models.users import UserNotifications +from lnbits.core.services.nostr import send_nostr_dm +from lnbits.core.services.notifications import send_user_notification +from lnbits.settings import settings +from lnbits.utils.nostr import normalize_private_key, normalize_public_key from lnurl import execute from loguru import logger @@ -10,6 +19,12 @@ from .crud import ( ) from .models import Ticket +DEFAULT_NOSTR_RELAYS = [ + "wss://relay.damus.io", + "wss://relay.primal.net", + "wss://relay.nostr.band", +] + async def set_ticket_paid(ticket: Ticket) -> Ticket: if ticket.paid: @@ -27,6 +42,77 @@ async def set_ticket_paid(ticket: Ticket) -> Ticket: return ticket +def send_ticket_notification_in_background(ticket: Ticket) -> None: + create_task(_send_ticket_notification(ticket)) + + +async def _send_ticket_notification(ticket: Ticket) -> None: + event = await get_event(ticket.event) + if not event: + logger.warning(f"Event {ticket.event} not found for ticket notification.") + return + + ticket_url = _ticket_url(ticket) + message = ( + f"{settings.lnbits_site_title}\n" + f"Your ticket for '{event.name}' is ready.\n" + f"Open it here: {ticket_url}" + ) + updated = False + + if ( + event.extra.email_notifications + and settings.lnbits_email_notifications_enabled + and ticket.email + ): + try: + await send_user_notification( + UserNotifications(email_address=ticket.email), + message, + "text_message", + ) + ticket.extra.email_notification_sent = True + updated = True + except Exception as exc: + logger.warning(f"Failed to email ticket {ticket.id}: {exc}") + + if ( + event.extra.nostr_notifications + and settings.is_nostr_notifications_configured() + and ticket.extra.nostr_identifier + ): + try: + await _send_nostr_ticket_notification( + ticket.extra.nostr_identifier, message + ) + ticket.extra.nostr_notification_sent = True + updated = True + except Exception as exc: + logger.warning(f"Failed to send nostr DM for ticket {ticket.id}: {exc}") + + if updated: + await update_ticket(ticket) + + +async def _send_nostr_ticket_notification(identifier: str, message: str) -> None: + if "@" in identifier: + await send_user_notification( + UserNotifications(nostr_identifier=identifier), + message, + "text_message", + ) + return + + private_key = normalize_private_key(settings.lnbits_nostr_notifications_private_key) + public_key = normalize_public_key(identifier) + await send_nostr_dm(private_key, public_key, message, DEFAULT_NOSTR_RELAYS) + + +def _ticket_url(ticket: Ticket) -> str: + base_url = (ticket.extra.ticket_base_url or settings.lnbits_baseurl).rstrip("/") + return f"{base_url}/events/ticket/{ticket.id}" + + async def refund_tickets(event_id: str): """ Refund tickets for an event that has not met the minimum ticket requirement. diff --git a/static/js/display.js b/static/js/display.js index a652ba5..a927b09 100644 --- a/static/js/display.js +++ b/static/js/display.js @@ -11,7 +11,9 @@ window.PageEventsDisplay = { data: { name: '', email: '', - refund: '' + refund: '', + nostr_identifier: '', + payment_method: 'lightning' } }, ticketLink: { @@ -23,7 +25,8 @@ window.PageEventsDisplay = { receive: { show: false, status: 'pending', - paymentReq: null + paymentReq: null, + isFiat: false }, paymentDismissMsg: null, paymentWebsocket: null @@ -35,7 +38,17 @@ window.PageEventsDisplay = { }, computed: { formatDescription() { - return LNbits.utils.convertMarkdown(this.info) + return LNbits.utils.convertMarkdown(this.event?.info || '') + }, + allowFiatCheckout() { + const currency = (this.event?.currency || '').toLowerCase() + return this.event?.allow_fiat && !['sat', 'sats'].includes(currency) + }, + allowEmailNotifications() { + return Boolean(this.event?.extra?.email_notifications) + }, + allowNostrNotifications() { + return Boolean(this.event?.extra?.nostr_notifications) } }, methods: { @@ -56,6 +69,8 @@ window.PageEventsDisplay = { this.formDialog.data.name = '' this.formDialog.data.email = '' this.formDialog.data.refund = '' + this.formDialog.data.nostr_identifier = '' + this.formDialog.data.payment_method = 'lightning' }, closeReceiveDialog() { @@ -87,6 +102,9 @@ window.PageEventsDisplay = { this.paymentReq = null this.formDialog.data.name = '' this.formDialog.data.email = '' + this.formDialog.data.refund = '' + this.formDialog.data.nostr_identifier = '' + this.formDialog.data.payment_method = 'lightning' Quasar.Notify.create({ type: 'positive', message: 'Sent, thank you!', @@ -95,7 +113,8 @@ window.PageEventsDisplay = { this.receive = { show: false, status: 'complete', - paymentReq: null + paymentReq: null, + isFiat: false } this.ticketLink = { show: true, @@ -103,9 +122,7 @@ window.PageEventsDisplay = { link: `/events/ticket/${paymentHash}` } } - setTimeout(() => { - window.location.href = `/events/ticket/${paymentHash}` - }, 5000) + window.open(`/events/ticket/${paymentHash}`, '_blank', 'noopener') }, async createInvoice() { try { @@ -117,10 +134,15 @@ window.PageEventsDisplay = { name: this.formDialog.data.name, email: this.formDialog.data.email, promo_code: this.formDialog.data.promo_code || null, - refund_address: this.formDialog.data.refund || null + refund_address: this.formDialog.data.refund || null, + nostr_identifier: this.formDialog.data.nostr_identifier || null, + payment_method: this.formDialog.data.payment_method } ) - this.paymentReq = data.payment_request + const isFiat = Boolean(data.is_fiat) + this.paymentReq = isFiat + ? data.fiat_payment_request || null + : data.payment_request this.paymentHash = data.payment_hash this.paymentDismissMsg = Quasar.Notify.create({ @@ -130,30 +152,34 @@ window.PageEventsDisplay = { this.receive = { show: true, status: 'pending', - paymentReq: this.paymentReq + paymentReq: this.paymentReq, + isFiat } - this.websocketListener(this.paymentHash) + if (isFiat && this.paymentReq) { + window.open(this.paymentReq, '_blank', 'noopener') + } + this.paymentWatcher(this.paymentHash) } catch (error) { LNbits.utils.notifyApiError(error) } }, - websocketListener(paymentHash) { + paymentWatcher(paymentHash) { if (this.paymentWebsocket) { this.paymentWebsocket.close() } const url = new URL(window.location) - url.protocol = url.protocol === 'https:' ? 'wss' : 'ws' - url.pathname = `/events/api/v1/tickets/ws/${paymentHash}` + url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:' + url.pathname = `/api/v1/ws/${paymentHash}` url.search = '' url.hash = '' - const ws = new WebSocket(url) + const ws = new WebSocket(url.toString()) this.paymentWebsocket = ws ws.onmessage = event => { const data = JSON.parse(event.data) - if (data.paid) { + if (data.pending === false) { this.paymentSuccess(paymentHash) ws.close() } diff --git a/static/js/display.vue b/static/js/display.vue index 3f80180..e37b844 100644 --- a/static/js/display.vue +++ b/static/js/display.vue @@ -16,41 +16,77 @@
Buy Ticket
+
+
+ +
+
+ +
+
+ +
+
- - - +
+
+ +
+
+ +
+
Link to your ticket! -

-

You'll be redirected in a few moments...

@@ -94,6 +128,37 @@ class="q-pa-lg q-pt-xl lnbits__dialog-card" > + +
+
Continue to checkout
+
+ Your fiat checkout opened in a new tab. If it did not, use the + button below. +
+ + Go to checkout + +
+
+ Copy payment link + Close +
+
{ - if (row.currency != 'sats') { + if (this.isFiatCurrency(row.currency)) { return LNbits.utils.formatCurrency( row.price_per_ticket.toFixed(2), row.currency @@ -98,6 +98,7 @@ window.PageEvents = { show: false, data: { currency: 'sats', + allow_fiat: false, extra: { promo_codes: [] } @@ -106,6 +107,9 @@ window.PageEvents = { } }, methods: { + isFiatCurrency(currency) { + return !['sat', 'sats'].includes((currency || '').toLowerCase()) + }, getTickets() { LNbits.api .request( @@ -158,10 +162,16 @@ window.PageEvents = { id: this.formDialog.data.wallet }) const data = this.formDialog.data - if (data.extra && !data.extra.promo_codes) { + if (data.extra?.promo_codes) { data.extra.promo_codes = data.extra.promo_codes - .filter(code => code.trim() !== '') - .map(code => code.trim().toUpperCase()) + .filter(code => code.code?.trim() !== '') + .map(code => ({ + ...code, + code: code.code.trim().toUpperCase() + })) + } + if (!this.isFiatCurrency(data.currency)) { + data.allow_fiat = false } if (data.id) { @@ -177,9 +187,12 @@ window.PageEvents = { } else { this.formDialog.data = { currency: 'sats', + allow_fiat: false, extra: { conditional: false, min_tickets: 1, + email_notifications: false, + nostr_notifications: false, promo_codes: [] } } @@ -189,7 +202,11 @@ window.PageEvents = { resetEventDialog() { this.formDialog.show = false this.formDialog.data = { + currency: 'sats', + allow_fiat: false, extra: { + email_notifications: false, + nostr_notifications: false, promo_codes: [] } } diff --git a/static/js/index.vue b/static/js/index.vue index 174f0c1..75af661 100644 --- a/static/js/index.vue +++ b/static/js/index.vue @@ -371,6 +371,18 @@ >
+ Add Promo Code + +
Ticket Delivery
+
+ Send the paid ticket link automatically by email or Nostr DM. +
+ +
diff --git a/tasks.py b/tasks.py index 651994e..1d30dce 100644 --- a/tasks.py +++ b/tasks.py @@ -6,7 +6,7 @@ from loguru import logger from .crud import get_ticket from .models import Ticket -from .services import set_ticket_paid +from .services import send_ticket_notification_in_background, set_ticket_paid payment_listeners: dict[str, list[asyncio.Queue[Ticket]]] = {} @@ -43,6 +43,7 @@ async def on_invoice_paid(payment: Payment) -> None: return ticket = await set_ticket_paid(ticket) + send_ticket_notification_in_background(ticket) if payment_listeners.get(payment.payment_hash): for paid_ticket_queue in payment_listeners[payment.payment_hash]: paid_ticket_queue.put_nowait(ticket) diff --git a/views_api.py b/views_api.py index 73cecd3..84dd9b0 100644 --- a/views_api.py +++ b/views_api.py @@ -8,20 +8,25 @@ from fastapi import ( Depends, HTTPException, Query, + Request, WebSocket, WebSocketDisconnect, ) from lnbits.core.crud import get_user +from lnbits.core.crud.wallets import get_wallet from lnbits.core.models import WalletTypeInfo -from lnbits.core.services import create_invoice +from lnbits.core.models.payments import CreateInvoice +from lnbits.core.services import create_payment_request from lnbits.decorators import ( require_admin_key, require_invoice_key, ) +from lnbits.settings import settings from lnbits.utils.exchange_rates import ( fiat_amount_as_satoshis, get_fiat_rate_satoshis, ) +from lnbits.utils.nostr import normalize_public_key from .crud import ( create_event, @@ -53,6 +58,10 @@ events_api_router = APIRouter(prefix="/api/v1/events") tickets_api_router = APIRouter(prefix="/api/v1/tickets") +def _is_fiat_currency(currency: str | None) -> bool: + return str(currency or "").lower() not in {"sat", "sats"} + + @events_api_router.get("") async def api_events( all_wallets: bool = Query(False), @@ -193,7 +202,9 @@ async def api_get_ticket(ticket_id: str) -> Ticket: @tickets_api_router.post("/{event_id}") -async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentRequest: +async def api_ticket_create( + event_id: str, data: CreateTicket, request: Request +) -> TicketPaymentRequest: event = await get_event(event_id) if not event: raise HTTPException( @@ -210,6 +221,21 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR email = data.email promo_code = data.promo_code.upper() if data.promo_code else None refund_address = data.refund_address + nostr_identifier = data.nostr_identifier.strip() if data.nostr_identifier else None + payment_method = (data.payment_method or "lightning").lower() + if payment_method not in {"lightning", "fiat"}: + raise HTTPException( + status_code=HTTPStatus.BAD_REQUEST, + detail="Unsupported payment method.", + ) + if nostr_identifier and "@" not in nostr_identifier: + try: + nostr_identifier = normalize_public_key(nostr_identifier) + except Exception as exc: + raise HTTPException( + status_code=HTTPStatus.BAD_REQUEST, + detail="Invalid Nostr identifier.", + ) from exc price = event.price_per_ticket extra: dict[str, Any] = {"tag": "events", "name": name, "email": email} @@ -224,19 +250,55 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR extra["promo_code"] = promo.code price = event.price_per_ticket * (1 - promo.discount_percent / 100) - if event.currency != "sats": + if payment_method == "fiat" and not event.allow_fiat: + raise HTTPException( + status_code=HTTPStatus.BAD_REQUEST, + detail="Fiat payments are not enabled for this event.", + ) + + if _is_fiat_currency(event.currency): extra["fiat"] = True extra["currency"] = event.currency extra["fiatAmount"] = price extra["rate"] = await get_fiat_rate_satoshis(event.currency) - price = await fiat_amount_as_satoshis(price, event.currency) + if payment_method != "fiat": + price = await fiat_amount_as_satoshis(price, event.currency) - payment = await create_invoice( + invoice_unit = event.currency + fiat_provider = None + if payment_method == "fiat": + if not _is_fiat_currency(event.currency): + raise HTTPException( + status_code=HTTPStatus.BAD_REQUEST, + detail="Fiat checkout requires a fiat-denominated ticket price.", + ) + wallet = await get_wallet(event.wallet) + if not wallet: + raise HTTPException( + status_code=HTTPStatus.NOT_FOUND, + detail="Event wallet does not exist.", + ) + providers = settings.get_fiat_providers_for_user(wallet.user) + fiat_provider = data.fiat_provider or (providers[0] if providers else None) + if not fiat_provider: + raise HTTPException( + status_code=HTTPStatus.BAD_REQUEST, + detail="No fiat payment provider configured for this event.", + ) + else: + invoice_unit = "sat" + + payment = await create_payment_request( wallet_id=event.wallet, - amount=price, - memo=f"{event_id}", - extra=extra, + invoice_data=CreateInvoice( + out=False, + amount=price, + unit=invoice_unit, + fiat_provider=fiat_provider, + memo=f"{event_id}", + extra=extra, + ), ) await create_ticket( payment_hash=payment.payment_hash, @@ -247,12 +309,18 @@ async def api_ticket_create(event_id: str, data: CreateTicket) -> TicketPaymentR extra={ "applied_promo_code": promo_code, "refund_address": refund_address, - "sats_paid": int(price), + "nostr_identifier": nostr_identifier, + "ticket_base_url": str(request.base_url).rstrip("/"), + "sats_paid": payment.sat, }, ) return TicketPaymentRequest( - payment_hash=payment.payment_hash, payment_request=payment.bolt11 + payment_hash=payment.payment_hash, + payment_request=getattr(payment, "bolt11", None), + fiat_payment_request=getattr(payment, "extra", {}).get("fiat_payment_request"), + fiat_provider=getattr(payment, "fiat_provider", None) or fiat_provider, + is_fiat=bool(getattr(payment, "fiat_provider", None) or fiat_provider), )